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

d3dx9: Fix shader constant byte calculation.

This commit is contained in:
Rico Schüller 2012-09-26 12:21:54 +02:00 committed by Alexandre Julliard
parent e817bc3f04
commit 3eb26010d8
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dlls/d3dx9_36/shader.c
View File

@ -671,15 +671,6 @@ static inline int is_vertex_shader(DWORD version)
return (version & 0xFFFF0000) == 0xFFFE0000; return (version & 0xFFFF0000) == 0xFFFE0000;
} }
static DWORD calc_bytes(D3DXCONSTANT_DESC *desc)
{
if (desc->RegisterSet != D3DXRS_FLOAT4 && desc->RegisterSet != D3DXRS_SAMPLER)
FIXME("Don't know how to calculate Bytes for constants of type %s\n",
debug_d3dxparameter_registerset(desc->RegisterSet));
return 4 * desc->Elements * desc->Rows * desc->Columns;
}
static inline struct ctab_constant *constant_from_handle(D3DXHANDLE handle) static inline struct ctab_constant *constant_from_handle(D3DXHANDLE handle)
{ {
return (struct ctab_constant *)handle; return (struct ctab_constant *)handle;
@ -1656,7 +1647,7 @@ static HRESULT parse_ctab_constant_type(const char *ctab, DWORD typeoffset, stru
} }
constant->desc.RegisterCount = max(0, min(max - index, size)); constant->desc.RegisterCount = max(0, min(max - index, size));
constant->desc.Bytes = calc_bytes(&constant->desc); constant->desc.Bytes = 4 * constant->desc.Elements * type->Rows * type->Columns;
return D3D_OK; return D3D_OK;