ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

d3dx9: Improve ID3DXConstantTable::Set*().

This commit is contained in:
Rico Schüller 2013-07-22 14:35:41 +02:00 committed by Alexandre Julliard
parent 918abfef6a
commit 8231c8ef50
2 changed files with 416 additions and 317 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

731
dlls/d3dx9_36/shader.c
View File

@ -929,320 +929,421 @@ static D3DXHANDLE WINAPI ID3DXConstantTableImpl_GetConstantElement(ID3DXConstant
return NULL;
}
static HRESULT set_scalar_array(ID3DXConstantTable *iface, IDirect3DDevice9 *device, D3DXHANDLE constant, const void *data,
UINT count, D3DXPARAMETER_TYPE type)
static inline DWORD get_index(const void **indata, UINT index, BOOL is_pointer)
{
struct ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface);
D3DXCONSTANT_DESC desc;
HRESULT hr;
UINT i, desc_count = 1;
float row[4] = {0.0f, 0.0f, 0.0f, 0.0f};
if (!indata)
return 0;
hr = ID3DXConstantTable_GetConstantDesc(iface, constant, &desc, &desc_count);
if (FAILED(hr))
if (is_pointer)
return ((DWORD **)indata)[index / 16][index % 16];
return (*((DWORD **)indata))[index];
}
static UINT set(struct ID3DXConstantTableImpl *table, IDirect3DDevice9 *device, struct ctab_constant *constant,
const void **indata, D3DXPARAMETER_TYPE intype, UINT *size, UINT incol, D3DXPARAMETER_CLASS inclass, UINT index,
BOOL is_pointer)
{
D3DXCONSTANT_DESC *desc = &constant->desc;
UINT l, i, regcount = 1, regsize = 1, cin = 1, rin = 1, ret, last = 0;
DWORD tmp;
/* size to small to set anything */
if (*size < desc->Rows * desc->Columns)
{
TRACE("ID3DXConstantTable_GetConstantDesc failed: %08x\n", hr);
return D3DERR_INVALIDCALL;
*size = 0;
return 0;
}
if (desc.Class != D3DXPC_SCALAR)
return D3D_OK;
switch (desc.RegisterSet)
/* D3DXPC_STRUCT is somewhat special */
if (desc->Class == D3DXPC_STRUCT)
{
case D3DXRS_FLOAT4:
for (i = 0; i < min(count, desc.RegisterCount); i++)
FIXME("Structs are not supported, yet.\n");
return 0;
}
/* elements */
if (desc->Elements > 1)
{
for (i = 0; i < desc->Elements && *size > 0; ++i)
{
last += set(table, device, &constant->constants[i], indata, intype, size, incol, inclass,
index + last, is_pointer);
/* adjust the vector size for matrix rows */
if (inclass == D3DXPC_MATRIX_ROWS && desc->Class == D3DXPC_VECTOR && (i % 4) == 3)
{
/* We need the for loop since each IDirect3DDevice9_Set*ShaderConstantF expects a float4 */
switch(type)
last += 12;
*size = *size < 12 ? 0 : *size - 12;
}
}
return last;
}
switch (desc->Class)
{
case D3DXPC_SCALAR:
case D3DXPC_VECTOR:
case D3DXPC_MATRIX_ROWS:
regcount = min(desc->RegisterCount, desc->Rows);
if (inclass == D3DXPC_MATRIX_ROWS) cin = incol;
else rin = incol;
regsize = desc->Columns;
break;
case D3DXPC_MATRIX_COLUMNS:
regcount = desc->Columns;
if (inclass == D3DXPC_MATRIX_ROWS) rin = incol;
else cin = incol;
regsize = desc->Rows;
break;
default:
FIXME("Unhandled variable class %s\n", debug_d3dxparameter_class(desc->Class));
return 0;
}
/* specific stuff for different in types */
switch (inclass)
{
case D3DXPC_SCALAR:
ret = desc->Columns * desc->Rows;
*size -= desc->Columns * desc->Rows;
break;
case D3DXPC_VECTOR:
switch (desc->Class)
{
case D3DXPC_MATRIX_ROWS:
if (*size < regcount * 4)
{
*size = 0;
return 0;
}
ret = 4 * regcount;
*size -= 4 * regcount;
break;
case D3DXPC_MATRIX_COLUMNS:
ret = 4 * regsize;
*size -= 4 * regcount;
break;
case D3DXPC_SCALAR:
ret = 1;
*size -= ret;
break;
case D3DXPC_VECTOR:
ret = 4;
*size -= ret;
break;
default:
FIXME("Unhandled variable class %s\n", debug_d3dxparameter_class(desc->Class));
return 0;
}
break;
case D3DXPC_MATRIX_ROWS:
switch (desc->Class)
{
case D3DXPC_MATRIX_ROWS:
case D3DXPC_MATRIX_COLUMNS:
if (*size < 16)
{
*size = 0;
return 0;
}
ret = 16;
break;
case D3DXPC_SCALAR:
ret = 4;
break;
case D3DXPC_VECTOR:
ret = 1;
break;
default:
FIXME("Unhandled variable class %s\n", debug_d3dxparameter_class(desc->Class));
return 0;
}
*size -= ret;
break;
case D3DXPC_MATRIX_COLUMNS:
switch (desc->Class)
{
case D3DXPC_MATRIX_ROWS:
case D3DXPC_MATRIX_COLUMNS:
if (*size < 16)
{
*size = 0;
return 0;
}
ret = 16;
break;
case D3DXPC_SCALAR:
ret = 1;
break;
case D3DXPC_VECTOR:
ret = 4;
break;
default:
FIXME("Unhandled variable class %s\n", debug_d3dxparameter_class(desc->Class));
return 0;
}
*size -= ret;
break;
default:
FIXME("Unhandled variable class %s\n", debug_d3dxparameter_class(inclass));
return 0;
}
/* set the registers */
switch (desc->RegisterSet)
{
case D3DXRS_BOOL:
regcount = min(desc->RegisterCount, desc->Columns * desc->Rows);
l = 0;
for (i = 0; i < regcount; ++i)
{
BOOL out;
DWORD t = get_index(indata, index + i / regsize * rin + l * cin, is_pointer);
set_number(&tmp, desc->Type, &t, intype);
set_number(&out, D3DXPT_BOOL, &tmp, desc->Type);
if (is_vertex_shader(table->desc.Version))
IDirect3DDevice9_SetVertexShaderConstantB(device, desc->RegisterIndex + i, &out, 1);
else
IDirect3DDevice9_SetPixelShaderConstantB(device, desc->RegisterIndex + i, &out, 1);
if (++l >= regsize) l = 0;
}
return ret;
case D3DXRS_INT4:
for (i = 0; i < regcount; ++i)
{
INT vec[4] = {0, 0, 1, 0};
for (l = 0; l < regsize; ++l)
{
case D3DXPT_FLOAT:
row[0] = ((float *)data)[i];
break;
case D3DXPT_INT:
row[0] = (float)((int *)data)[i];
break;
case D3DXPT_BOOL:
row[0] = ((BOOL *)data)[i] ? 1.0f : 0.0f;
break;
default:
FIXME("Unhandled type %s\n", debug_d3dxparameter_type(type));
return D3DERR_INVALIDCALL;
DWORD t = get_index(indata, index + i * rin + l * cin, is_pointer);
set_number(&tmp, desc->Type, &t, intype);
set_number(&vec[l], D3DXPT_INT, &tmp, desc->Type);
}
set_float_shader_constant(This, device, desc.RegisterIndex + i, row, 1);
if (is_vertex_shader(table->desc.Version))
IDirect3DDevice9_SetVertexShaderConstantI(device, desc->RegisterIndex + i, vec, 1);
else
IDirect3DDevice9_SetPixelShaderConstantI(device, desc->RegisterIndex + i, vec, 1);
}
break;
default:
FIXME("Unhandled register set %s\n", debug_d3dxparameter_registerset(desc.RegisterSet));
return E_NOTIMPL;
}
return ret;
return D3D_OK;
}
static HRESULT set_vector_array(ID3DXConstantTable *iface, IDirect3DDevice9 *device, D3DXHANDLE constant, const void *data,
UINT count, D3DXPARAMETER_TYPE type)
{
struct ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface);
D3DXCONSTANT_DESC desc;
HRESULT hr;
UINT i, j, desc_count = 1;
float vec[4] = {0.0f, 0.0f, 0.0f, 0.0f};
hr = ID3DXConstantTable_GetConstantDesc(iface, constant, &desc, &desc_count);
if (FAILED(hr))
{
TRACE("ID3DXConstantTable_GetConstantDesc failed: %08x\n", hr);
return D3DERR_INVALIDCALL;
}
if (desc.Class == D3DXPC_MATRIX_ROWS || desc.Class == D3DXPC_MATRIX_COLUMNS)
return D3D_OK;
switch (desc.RegisterSet)
{
case D3DXRS_FLOAT4:
for (i = 0; i < min(count, desc.RegisterCount); i++)
for (i = 0; i < regcount; ++i)
{
switch (type)
FLOAT vec[4] = {0};
for (l = 0; l < regsize; ++l)
{
case D3DXPT_FLOAT:
memcpy(vec, ((float *)data) + i * desc.Columns, desc.Columns * sizeof(float));
break;
case D3DXPT_INT:
for (j = 0; j < desc.Columns; j++)
vec[j] = (float)((int *)data)[i * desc.Columns + j];
break;
case D3DXPT_BOOL:
for (j = 0; j < desc.Columns; j++)
vec[j] = ((BOOL *)data)[i * desc.Columns + j] ? 1.0f : 0.0f;
break;
default:
FIXME("Unhandled type %s\n", debug_d3dxparameter_type(type));
return D3DERR_INVALIDCALL;
DWORD t = get_index(indata, index + i * rin + l * cin, is_pointer);
set_number(&tmp, desc->Type, &t, intype);
set_number(&vec[l], D3DXPT_FLOAT, &tmp, desc->Type);
}
set_float_shader_constant(This, device, desc.RegisterIndex + i, vec, 1);
if (is_vertex_shader(table->desc.Version))
IDirect3DDevice9_SetVertexShaderConstantF(device, desc->RegisterIndex + i, vec, 1);
else
IDirect3DDevice9_SetPixelShaderConstantF(device, desc->RegisterIndex + i, vec, 1);
}
break;
default:
FIXME("Unhandled register set %s\n", debug_d3dxparameter_registerset(desc.RegisterSet));
return E_NOTIMPL;
}
return ret;
return D3D_OK;
default:
FIXME("Unhandled register set %s\n", debug_d3dxparameter_registerset(desc->RegisterSet));
return 0;
}
}
static HRESULT set_float_matrix(FLOAT *matrix, const D3DXCONSTANT_DESC *desc,
UINT row_offset, UINT column_offset, UINT rows, UINT columns,
const void *data, D3DXPARAMETER_TYPE type, UINT src_columns)
static HRESULT set_scalar(struct ID3DXConstantTableImpl *table, IDirect3DDevice9 *device, D3DXHANDLE constant,
const void *indata, D3DXPARAMETER_TYPE intype)
{
UINT i, j;
switch (type)
{
case D3DXPT_FLOAT:
for (i = 0; i < rows; i++)
{
for (j = 0; j < columns; j++)
matrix[i * row_offset + j * column_offset] = ((FLOAT *)data)[i * src_columns + j];
}
break;
case D3DXPT_INT:
for (i = 0; i < rows; i++)
{
for (j = 0; j < columns; j++)
matrix[i * row_offset + j * column_offset] = ((INT *)data)[i * src_columns + j];
}
break;
default:
FIXME("Unhandled type %s\n", debug_d3dxparameter_type(type));
return D3DERR_INVALIDCALL;
}
return D3D_OK;
}
static HRESULT set_matrix_array(ID3DXConstantTable *iface, IDirect3DDevice9 *device, D3DXHANDLE constant, const void *data,
UINT count, D3DXPARAMETER_CLASS class, D3DXPARAMETER_TYPE type, UINT rows, UINT columns)
{
struct ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface);
struct ctab_constant *c = get_valid_constant(This, constant);
D3DXCONSTANT_DESC *desc;
UINT registers_per_matrix, num_rows, num_columns, i;
UINT row_offset = 1, column_offset = 1;
const DWORD *data_ptr;
FLOAT matrix[16] = {0.0f, 0.0f, 0.0f, 0.0f,
0.0f, 0.0f, 0.0f, 0.0f,
0.0f, 0.0f, 0.0f, 0.0f,
0.0f, 0.0f, 0.0f, 0.0f};
struct ctab_constant *c = get_valid_constant(table, constant);
UINT count = 1;
if (!c)
{
WARN("Invalid argument specified\n");
return D3DERR_INVALIDCALL;
}
desc = &c->desc;
if (desc->Class == D3DXPC_MATRIX_ROWS
|| desc->Class == D3DXPC_MATRIX_COLUMNS
|| desc->Class == D3DXPC_VECTOR
|| desc->Class == D3DXPC_SCALAR)
switch (c->desc.Class)
{
if (desc->Class == class) row_offset = 4;
else column_offset = 4;
case D3DXPC_SCALAR:
set(table, device, c, &indata, intype, &count, c->desc.Columns, D3DXPC_SCALAR, 0, FALSE);
return D3D_OK;
if (class == D3DXPC_MATRIX_ROWS)
{
if (desc->Class == D3DXPC_VECTOR) return D3D_OK;
case D3DXPC_VECTOR:
case D3DXPC_MATRIX_ROWS:
case D3DXPC_MATRIX_COLUMNS:
case D3DXPC_STRUCT:
return D3D_OK;
num_rows = desc->Rows;
num_columns = desc->Columns;
}
else
{
num_rows = desc->Columns;
num_columns = desc->Rows;
}
registers_per_matrix = (desc->Class == D3DXPC_MATRIX_COLUMNS) ? desc->Columns : desc->Rows;
}
else
{
FIXME("Unhandled variable class %s\n", debug_d3dxparameter_class(desc->Class));
return E_NOTIMPL;
}
switch (desc->RegisterSet)
{
case D3DXRS_FLOAT4:
data_ptr = data;
for (i = 0; i < count; i++)
{
HRESULT hr;
if (registers_per_matrix * (i + 1) > desc->RegisterCount)
break;
hr = set_float_matrix(matrix, desc, row_offset, column_offset, num_rows, num_columns, data_ptr, type, columns);
if (FAILED(hr)) return hr;
set_float_shader_constant(This, device, desc->RegisterIndex + i * registers_per_matrix, matrix, registers_per_matrix);
data_ptr += rows * columns;
}
break;
default:
FIXME("Unhandled register set %s\n", debug_d3dxparameter_registerset(desc->RegisterSet));
return E_NOTIMPL;
FIXME("Unhandled parameter class %s\n", debug_d3dxparameter_class(c->desc.Class));
return D3DERR_INVALIDCALL;
}
return D3D_OK;
}
static HRESULT set_matrix_pointer_array(ID3DXConstantTable *iface, IDirect3DDevice9 *device, D3DXHANDLE constant,
const D3DXMATRIX **data, UINT count, D3DXPARAMETER_CLASS class)
static HRESULT set_scalar_array(struct ID3DXConstantTableImpl *table, IDirect3DDevice9 *device, D3DXHANDLE constant,
const void *indata, UINT count, D3DXPARAMETER_TYPE intype)
{
struct ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface);
D3DXCONSTANT_DESC desc;
HRESULT hr;
UINT registers_per_matrix;
UINT i, desc_count = 1;
UINT num_rows, num_columns;
UINT row_offset, column_offset;
FLOAT matrix[16] = {0.0f, 0.0f, 0.0f, 0.0f,
0.0f, 0.0f, 0.0f, 0.0f,
0.0f, 0.0f, 0.0f, 0.0f,
0.0f, 0.0f, 0.0f, 0.0f};
struct ctab_constant *c = get_valid_constant(table, constant);
hr = ID3DXConstantTable_GetConstantDesc(iface, constant, &desc, &desc_count);
if (FAILED(hr))
if (!c)
{
TRACE("ID3DXConstantTable_GetConstantDesc failed: %08x\n", hr);
WARN("Invalid argument specified\n");
return D3DERR_INVALIDCALL;
}
if (desc.Class == D3DXPC_MATRIX_ROWS || desc.Class == D3DXPC_MATRIX_COLUMNS)
switch (c->desc.Class)
{
if (desc.Class == class)
{
column_offset = 1;
row_offset = 4;
}
else
{
column_offset = 4;
row_offset = 1;
}
case D3DXPC_SCALAR:
case D3DXPC_VECTOR:
case D3DXPC_MATRIX_ROWS:
case D3DXPC_MATRIX_COLUMNS:
case D3DXPC_STRUCT:
set(table, device, c, &indata, intype, &count, c->desc.Columns, D3DXPC_SCALAR, 0, FALSE);
return D3D_OK;
if (class == D3DXPC_MATRIX_ROWS)
{
num_rows = desc.Rows;
num_columns = desc.Columns;
}
else
{
num_rows = desc.Columns;
num_columns = desc.Rows;
}
registers_per_matrix = (desc.Class == D3DXPC_MATRIX_ROWS) ? desc.Rows : desc.Columns;
}
else if (desc.Class == D3DXPC_SCALAR)
{
registers_per_matrix = 1;
column_offset = 1;
row_offset = 1;
num_rows = desc.Rows;
num_columns = desc.Columns;
}
else if (desc.Class == D3DXPC_VECTOR)
{
registers_per_matrix = 1;
if (class == D3DXPC_MATRIX_ROWS)
{
column_offset = 1;
row_offset = 4;
num_rows = desc.Rows;
num_columns = desc.Columns;
}
else
{
column_offset = 4;
row_offset = 1;
num_rows = desc.Columns;
num_columns = desc.Rows;
}
}
else
{
FIXME("Unhandled variable class %s\n", debug_d3dxparameter_class(desc.Class));
return D3D_OK;
}
switch (desc.RegisterSet)
{
case D3DXRS_FLOAT4:
for (i = 0; i < count; i++)
{
if (registers_per_matrix * (i + 1) > desc.RegisterCount)
break;
hr = set_float_matrix(matrix, &desc, row_offset, column_offset, num_rows, num_columns, *data, D3DXPT_FLOAT, 4);
if (FAILED(hr)) return hr;
set_float_shader_constant(This, device, desc.RegisterIndex + i * registers_per_matrix, matrix, registers_per_matrix);
data++;
}
break;
default:
FIXME("Unhandled register set %s\n", debug_d3dxparameter_registerset(desc.RegisterSet));
return E_NOTIMPL;
FIXME("Unhandled parameter class %s\n", debug_d3dxparameter_class(c->desc.Class));
return D3DERR_INVALIDCALL;
}
}
static HRESULT set_vector(struct ID3DXConstantTableImpl *table, IDirect3DDevice9 *device, D3DXHANDLE constant,
const void *indata, D3DXPARAMETER_TYPE intype)
{
struct ctab_constant *c = get_valid_constant(table, constant);
UINT count = 4;
if (!c)
{
WARN("Invalid argument specified\n");
return D3DERR_INVALIDCALL;
}
return D3D_OK;
switch (c->desc.Class)
{
case D3DXPC_SCALAR:
case D3DXPC_VECTOR:
case D3DXPC_STRUCT:
set(table, device, c, &indata, intype, &count, 4, D3DXPC_VECTOR, 0, FALSE);
return D3D_OK;
case D3DXPC_MATRIX_ROWS:
case D3DXPC_MATRIX_COLUMNS:
return D3D_OK;
default:
FIXME("Unhandled parameter class %s\n", debug_d3dxparameter_class(c->desc.Class));
return D3DERR_INVALIDCALL;
}
}
static HRESULT set_vector_array(struct ID3DXConstantTableImpl *table, IDirect3DDevice9 *device, D3DXHANDLE constant,
const void *indata, UINT count, D3DXPARAMETER_TYPE intype)
{
struct ctab_constant *c = get_valid_constant(table, constant);
if (!c)
{
WARN("Invalid argument specified\n");
return D3DERR_INVALIDCALL;
}
switch (c->desc.Class)
{
case D3DXPC_SCALAR:
case D3DXPC_VECTOR:
case D3DXPC_MATRIX_ROWS:
case D3DXPC_MATRIX_COLUMNS:
case D3DXPC_STRUCT:
count *= 4;
set(table, device, c, &indata, intype, &count, 4, D3DXPC_VECTOR, 0, FALSE);
return D3D_OK;
default:
FIXME("Unhandled parameter class %s\n", debug_d3dxparameter_class(c->desc.Class));
return D3DERR_INVALIDCALL;
}
}
static HRESULT set_matrix_array(struct ID3DXConstantTableImpl *table, IDirect3DDevice9 *device, D3DXHANDLE constant,
const void *indata, UINT count, BOOL transpose)
{
struct ctab_constant *c = get_valid_constant(table, constant);
if (!c)
{
WARN("Invalid argument specified\n");
return D3DERR_INVALIDCALL;
}
switch (c->desc.Class)
{
case D3DXPC_SCALAR:
case D3DXPC_VECTOR:
case D3DXPC_MATRIX_ROWS:
case D3DXPC_MATRIX_COLUMNS:
case D3DXPC_STRUCT:
count *= 16;
set(table, device, c, &indata, D3DXPT_FLOAT, &count, 4,
transpose ? D3DXPC_MATRIX_ROWS : D3DXPC_MATRIX_COLUMNS, 0, FALSE);
return D3D_OK;
default:
FIXME("Unhandled parameter class %s\n", debug_d3dxparameter_class(c->desc.Class));
return D3DERR_INVALIDCALL;
}
}
static HRESULT set_matrix_pointer_array(struct ID3DXConstantTableImpl *table, IDirect3DDevice9 *device,
D3DXHANDLE constant, const void **indata, UINT count, BOOL transpose)
{
struct ctab_constant *c = get_valid_constant(table, constant);
if (!c)
{
WARN("Invalid argument specified\n");
return D3DERR_INVALIDCALL;
}
switch (c->desc.Class)
{
case D3DXPC_SCALAR:
case D3DXPC_VECTOR:
case D3DXPC_MATRIX_ROWS:
case D3DXPC_MATRIX_COLUMNS:
case D3DXPC_STRUCT:
count *= 16;
set(table, device, c, indata, D3DXPT_FLOAT, &count, 4,
transpose ? D3DXPC_MATRIX_ROWS : D3DXPC_MATRIX_COLUMNS, 0, TRUE);
return D3D_OK;
default:
FIXME("Unhandled parameter class %s\n", debug_d3dxparameter_class(c->desc.Class));
return D3DERR_INVALIDCALL;
}
}
static HRESULT WINAPI ID3DXConstantTableImpl_SetDefaults(struct ID3DXConstantTable *iface,
@ -1270,37 +1371,35 @@ static HRESULT WINAPI ID3DXConstantTableImpl_SetDefaults(struct ID3DXConstantTab
}
static HRESULT WINAPI ID3DXConstantTableImpl_SetValue(struct ID3DXConstantTable *iface,
struct IDirect3DDevice9 *device, D3DXHANDLE constant, const void *data, UINT bytes)
struct IDirect3DDevice9 *device, D3DXHANDLE constant, const void *data, unsigned int bytes)
{
struct ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface);
HRESULT hr;
UINT elements;
UINT count = 1;
D3DXCONSTANT_DESC desc;
struct ID3DXConstantTableImpl *table = impl_from_ID3DXConstantTable(iface);
struct ctab_constant *c = get_valid_constant(table, constant);
D3DXCONSTANT_DESC *desc;
TRACE("(%p)->(%p, %p, %p, %d)\n", This, device, constant, data, bytes);
TRACE("iface %p, device %p, constant %p, data %p, bytes %u\n", iface, device, constant, data, bytes);
if (!device || !constant || !data)
if (!device || !c || !data)
{
WARN("Invalid argument specified\n");
return D3DERR_INVALIDCALL;
}
hr = ID3DXConstantTable_GetConstantDesc(iface, constant, &desc, &count);
if (FAILED(hr))
return hr;
desc = &c->desc;
elements = bytes / (desc.Bytes / desc.Elements);
switch (desc.Class)
switch (desc->Class)
{
case D3DXPC_SCALAR:
return set_scalar_array(iface, device, constant, data, elements, desc.Type);
case D3DXPC_VECTOR:
return set_vector_array(iface, device, constant, data, elements, desc.Type);
case D3DXPC_MATRIX_ROWS:
case D3DXPC_MATRIX_COLUMNS:
return set_matrix_array(iface, device, constant, data, elements,
D3DXPC_MATRIX_ROWS, desc.Type, desc.Rows, desc.Columns);
case D3DXPC_STRUCT:
bytes /= 4;
set(table, device, c, &data, desc->Type, &bytes, desc->Columns, D3DXPC_SCALAR, 0, FALSE);
return D3D_OK;
default:
FIXME("Unhandled parameter class %s\n", debug_d3dxparameter_class(desc.Class));
FIXME("Unhandled parameter class %s\n", debug_d3dxparameter_class(desc->Class));
return D3DERR_INVALIDCALL;
}
}
@ -1310,9 +1409,9 @@ static HRESULT WINAPI ID3DXConstantTableImpl_SetBool(struct ID3DXConstantTable *
{
struct ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface);
TRACE("(%p)->(%p, %p, %d)\n", This, device, constant, b);
TRACE("iface %p, device %p, constant %p, b %d\n", iface, device, constant, b);
return set_scalar_array(iface, device, constant, &b, 1, D3DXPT_BOOL);
return set_scalar(This, device, constant, &b, D3DXPT_BOOL);
}
static HRESULT WINAPI ID3DXConstantTableImpl_SetBoolArray(struct ID3DXConstantTable *iface,
@ -1320,9 +1419,9 @@ static HRESULT WINAPI ID3DXConstantTableImpl_SetBoolArray(struct ID3DXConstantTa
{
struct ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface);
TRACE("(%p)->(%p, %p, %p, %d)\n", This, device, constant, b, count);
TRACE("iface %p, device %p, constant %p, b %p, count %d\n", iface, device, constant, b, count);
return set_scalar_array(iface, device, constant, b, count, D3DXPT_BOOL);
return set_scalar_array(This, device, constant, b, count, D3DXPT_BOOL);
}
static HRESULT WINAPI ID3DXConstantTableImpl_SetInt(struct ID3DXConstantTable *iface,
@ -1330,9 +1429,9 @@ static HRESULT WINAPI ID3DXConstantTableImpl_SetInt(struct ID3DXConstantTable *i
{
struct ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface);
TRACE("(%p)->(%p, %p, %d)\n", This, device, constant, n);
TRACE("iface %p, device %p, constant %p, n %d\n", iface, device, constant, n);
return set_scalar_array(iface, device, constant, &n, 1, D3DXPT_INT);
return set_scalar(This, device, constant, &n, D3DXPT_INT);
}
static HRESULT WINAPI ID3DXConstantTableImpl_SetIntArray(struct ID3DXConstantTable *iface,
@ -1340,9 +1439,9 @@ static HRESULT WINAPI ID3DXConstantTableImpl_SetIntArray(struct ID3DXConstantTab
{
struct ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface);
TRACE("(%p)->(%p, %p, %p, %d)\n", This, device, constant, n, count);
TRACE("iface %p, device %p, constant %p, n %p, count %d\n", iface, device, constant, n, count);
return set_scalar_array(iface, device, constant, n, count, D3DXPT_INT);
return set_scalar_array(This, device, constant, n, count, D3DXPT_INT);
}
static HRESULT WINAPI ID3DXConstantTableImpl_SetFloat(struct ID3DXConstantTable *iface,
@ -1350,9 +1449,9 @@ static HRESULT WINAPI ID3DXConstantTableImpl_SetFloat(struct ID3DXConstantTable
{
struct ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface);
TRACE("(%p)->(%p, %p, %f)\n", This, device, constant, f);
TRACE("iface %p, device %p, constant %p, f %f\n", iface, device, constant, f);
return set_scalar_array(iface, device, constant, &f, 1, D3DXPT_FLOAT);
return set_scalar(This, device, constant, &f, D3DXPT_FLOAT);
}
static HRESULT WINAPI ID3DXConstantTableImpl_SetFloatArray(struct ID3DXConstantTable *iface,
@ -1360,9 +1459,9 @@ static HRESULT WINAPI ID3DXConstantTableImpl_SetFloatArray(struct ID3DXConstantT
{
struct ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface);
TRACE("(%p)->(%p, %p, %p, %d)\n", This, device, constant, f, count);
TRACE("iface %p, device %p, constant %p, f %p, count %d\n", iface, device, constant, f, count);
return set_scalar_array(iface, device, constant, f, count, D3DXPT_FLOAT);
return set_scalar_array(This, device, constant, f, count, D3DXPT_FLOAT);
}
static HRESULT WINAPI ID3DXConstantTableImpl_SetVector(struct ID3DXConstantTable *iface,
@ -1370,9 +1469,9 @@ static HRESULT WINAPI ID3DXConstantTableImpl_SetVector(struct ID3DXConstantTable
{
struct ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface);
TRACE("(%p)->(%p, %p, %p)\n", This, device, constant, vector);
TRACE("iface %p, device %p, constant %p, vector %p\n", iface, device, constant, vector);
return set_vector_array(iface, device, constant, vector, 1, D3DXPT_FLOAT);
return set_vector(This, device, constant, vector, D3DXPT_FLOAT);
}
static HRESULT WINAPI ID3DXConstantTableImpl_SetVectorArray(struct ID3DXConstantTable *iface,
@ -1380,9 +1479,9 @@ static HRESULT WINAPI ID3DXConstantTableImpl_SetVectorArray(struct ID3DXConstant
{
struct ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface);
TRACE("(%p)->(%p, %p, %p, %d)\n", This, device, constant, vector, count);
TRACE("iface %p, device %p, constant %p, vector %p, count %u\n", iface, device, constant, vector, count);
return set_vector_array(iface, device, constant, vector, count, D3DXPT_FLOAT);
return set_vector_array(This, device, constant, vector, count, D3DXPT_FLOAT);
}
static HRESULT WINAPI ID3DXConstantTableImpl_SetMatrix(struct ID3DXConstantTable *iface,
@ -1390,9 +1489,9 @@ static HRESULT WINAPI ID3DXConstantTableImpl_SetMatrix(struct ID3DXConstantTable
{
struct ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface);
TRACE("(%p)->(%p, %p, %p)\n", This, device, constant, matrix);
TRACE("iface %p, device %p, constant %p, matrix %p\n", iface, device, constant, matrix);
return set_matrix_array(iface, device, constant, matrix, 1, D3DXPC_MATRIX_ROWS, D3DXPT_FLOAT, 4, 4);
return set_matrix_array(This, device, constant, matrix, 1, FALSE);
}
static HRESULT WINAPI ID3DXConstantTableImpl_SetMatrixArray(struct ID3DXConstantTable *iface,
@ -1400,9 +1499,9 @@ static HRESULT WINAPI ID3DXConstantTableImpl_SetMatrixArray(struct ID3DXConstant
{
struct ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface);
TRACE("(%p)->(%p, %p, %p, %d)\n", This, device, constant, matrix, count);
TRACE("iface %p, device %p, constant %p, matrix %p, count %u\n", iface, device, constant, matrix, count);
return set_matrix_array(iface, device, constant, matrix, count, D3DXPC_MATRIX_ROWS, D3DXPT_FLOAT, 4, 4);
return set_matrix_array(This, device, constant, matrix, count, FALSE);
}
static HRESULT WINAPI ID3DXConstantTableImpl_SetMatrixPointerArray(struct ID3DXConstantTable *iface,
@ -1410,9 +1509,9 @@ static HRESULT WINAPI ID3DXConstantTableImpl_SetMatrixPointerArray(struct ID3DXC
{
struct ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface);
TRACE("(%p)->(%p, %p, %p, %d)\n", This, device, constant, matrix, count);
TRACE("iface %p, device %p, constant %p, matrix %p, count %u)\n", iface, device, constant, matrix, count);
return set_matrix_pointer_array(iface, device, constant, matrix, count, D3DXPC_MATRIX_ROWS);
return set_matrix_pointer_array(This, device, constant, (const void **)matrix, count, FALSE);
}
static HRESULT WINAPI ID3DXConstantTableImpl_SetMatrixTranspose(struct ID3DXConstantTable *iface,
@ -1420,9 +1519,9 @@ static HRESULT WINAPI ID3DXConstantTableImpl_SetMatrixTranspose(struct ID3DXCons
{
struct ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface);
TRACE("(%p)->(%p, %p, %p)\n", This, device, constant, matrix);
TRACE("iface %p, device %p, constant %p, matrix %p\n", iface, device, constant, matrix);
return set_matrix_array(iface, device, constant, matrix, 1, D3DXPC_MATRIX_COLUMNS, D3DXPT_FLOAT, 4, 4);
return set_matrix_array(This, device, constant, matrix, 1, TRUE);
}
static HRESULT WINAPI ID3DXConstantTableImpl_SetMatrixTransposeArray(struct ID3DXConstantTable *iface,
@ -1430,9 +1529,9 @@ static HRESULT WINAPI ID3DXConstantTableImpl_SetMatrixTransposeArray(struct ID3D
{
struct ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface);
TRACE("(%p)->(%p, %p, %p, %d)\n", This, device, constant, matrix, count);
TRACE("iface %p, device %p, constant %p, matrix %p, count %u\n", iface, device, constant, matrix, count);
return set_matrix_array(iface, device, constant, matrix, count, D3DXPC_MATRIX_COLUMNS, D3DXPT_FLOAT, 4, 4);
return set_matrix_array(This, device, constant, matrix, count, TRUE);
}
static HRESULT WINAPI ID3DXConstantTableImpl_SetMatrixTransposePointerArray(struct ID3DXConstantTable *iface,
@ -1440,9 +1539,9 @@ static HRESULT WINAPI ID3DXConstantTableImpl_SetMatrixTransposePointerArray(stru
{
struct ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface);
TRACE("(%p)->(%p, %p, %p, %d)\n", This, device, constant, matrix, count);
TRACE("iface %p, device %p, constant %p, matrix %p, count %u)\n", iface, device, constant, matrix, count);
return set_matrix_pointer_array(iface, device, constant, matrix, count, D3DXPC_MATRIX_COLUMNS);
return set_matrix_pointer_array(This, device, constant, (const void **)matrix, count, TRUE);
}
static const struct ID3DXConstantTableVtbl ID3DXConstantTable_Vtbl =

2
dlls/d3dx9_36/tests/shader.c
View File

@ -825,7 +825,7 @@ static void test_setting_matrices_table(IDirect3DDevice9 *device)
ok(res == D3D_OK, "ID3DXConstantTable_SetMatrix failed on variable fmatrix3x1: got %#x\n", res);
IDirect3DDevice9_GetVertexShaderConstantF(device, 4, out, 2);
todo_wine ok(out[0] == (int)S(U(fmatrix))._11 && out[1] == (int)S(U(fmatrix))._12 && out[2] == (int)S(U(fmatrix))._13
ok(out[0] == (int)S(U(fmatrix))._11 && out[1] == (int)S(U(fmatrix))._12 && out[2] == (int)S(U(fmatrix))._13
&& out[3] == 0
&& out[4] == (int)S(U(fmatrix))._21 && out[5] == (int)S(U(fmatrix))._22 && out[6] == (int)S(U(fmatrix))._23
&& out[7] == 0,