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

d3dx9: Use parameter data for the first constant only in d3dx_set_shader_const_state(). 

Signed-off-by: Paul Gofman <gofmanp@gmail.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Paul Gofman 2019-02-13 21:03:41 +03:00 committed by Alexandre Julliard
parent b3e91c3408
commit f72204abd6
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dlls/d3dx9_36/effect.c
View File

@ -2934,11 +2934,15 @@ static HRESULT d3dx_set_shader_const_state(struct ID3DXEffectImpl *effect, enum
return D3DERR_INVALIDCALL; return D3DERR_INVALIDCALL;
} }
if (param->bytes % const_tbl[op].elem_size) if (param->bytes % const_tbl[op].elem_size || element_count > 1)
{ {
unsigned int param_data_size;
TRACE("Parameter size %u, rows %u, cols %u.\n", param->bytes, param->rows, param->columns); TRACE("Parameter size %u, rows %u, cols %u.\n", param->bytes, param->rows, param->columns);
if (++element_count > 1) if (param->bytes % const_tbl[op].elem_size)
++element_count;
if (element_count > 1)
{ {
WARN("Setting %u elements.\n", element_count); WARN("Setting %u elements.\n", element_count);
buffer = HeapAlloc(GetProcessHeap(), 0, const_tbl[op].elem_size * element_count); buffer = HeapAlloc(GetProcessHeap(), 0, const_tbl[op].elem_size * element_count);
@ -2954,9 +2958,10 @@ static HRESULT d3dx_set_shader_const_state(struct ID3DXEffectImpl *effect, enum
assert(const_tbl[op].elem_size <= sizeof(value)); assert(const_tbl[op].elem_size <= sizeof(value));
buffer = &value; buffer = &value;
} }
memcpy(buffer, value_ptr, param->bytes); param_data_size = min(param->bytes, const_tbl[op].elem_size);
memset((unsigned char *)buffer + param->bytes, 0, memcpy(buffer, value_ptr, param_data_size);
const_tbl[op].elem_size * element_count - param->bytes); memset((unsigned char *)buffer + param_data_size, 0,
const_tbl[op].elem_size * element_count - param_data_size);
} }
switch (op) switch (op)

4
dlls/d3dx9_36/tests/effect.c
View File

@ -3178,12 +3178,12 @@ static void test_effect_states(IDirect3DDevice9 *device)
fvect.x, fvect.y, fvect.z, fvect.w); fvect.x, fvect.y, fvect.z, fvect.w);
hr = IDirect3DDevice9_GetVertexShaderConstantF(device, 5, &fvect.x, 1); hr = IDirect3DDevice9_GetVertexShaderConstantF(device, 5, &fvect.x, 1);
ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr);
todo_wine ok(fvect.x == 0.0f && fvect.y == 0.0f && fvect.z == 0.0f && fvect.w == 0.0f, ok(fvect.x == 0.0f && fvect.y == 0.0f && fvect.z == 0.0f && fvect.w == 0.0f,
"Got unexpected vertex shader constant (%.8e, %.8e, %.8e, %.8e).\n", "Got unexpected vertex shader constant (%.8e, %.8e, %.8e, %.8e).\n",
fvect.x, fvect.y, fvect.z, fvect.w); fvect.x, fvect.y, fvect.z, fvect.w);
hr = IDirect3DDevice9_GetVertexShaderConstantF(device, 6, &fvect.x, 1); hr = IDirect3DDevice9_GetVertexShaderConstantF(device, 6, &fvect.x, 1);
ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr);
todo_wine ok(fvect.x == 0.0f && fvect.y == 0.0f && fvect.z == 0.0f && fvect.w == 0.0f, ok(fvect.x == 0.0f && fvect.y == 0.0f && fvect.z == 0.0f && fvect.w == 0.0f,
"Got unexpected vertex shader constant (%.8e, %.8e, %.8e, %.8e).\n", "Got unexpected vertex shader constant (%.8e, %.8e, %.8e, %.8e).\n",
fvect.x, fvect.y, fvect.z, fvect.w); fvect.x, fvect.y, fvect.z, fvect.w);
hr = IDirect3DDevice9_GetVertexShaderConstantF(device, 7, &fvect.x, 1); hr = IDirect3DDevice9_GetVertexShaderConstantF(device, 7, &fvect.x, 1);