system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-11-05 18:01:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

d3dx9_36: Separate calculation of Bytes.

Browse source
This commit is contained in:
Travis Athougies 2011-07-14 14:06:48 -07:00 committed by Alexandre Julliard
parent 1e2e45ce66
commit c55caea1b3
1 changed files with 10 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
dlls/d3dx9_36/shader.c
View file

@ -639,6 +639,15 @@ 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 %d\n",
desc->RegisterSet);
return 4 * desc->Elements * desc->Rows * desc->Columns;
}
/*** IUnknown methods ***/ /*** IUnknown methods ***/
static HRESULT WINAPI ID3DXConstantTableImpl_QueryInterface(ID3DXConstantTable* iface, REFIID riid, void** ppvObject) static HRESULT WINAPI ID3DXConstantTableImpl_QueryInterface(ID3DXConstantTable* iface, REFIID riid, void** ppvObject)
{ {
@ -1130,6 +1139,7 @@ static HRESULT parse_ctab_constant_type(const D3DXSHADER_TYPEINFO *type, ctab_co
constant->desc.Columns = type->Columns; constant->desc.Columns = type->Columns;
constant->desc.Elements = type->Elements; constant->desc.Elements = type->Elements;
constant->desc.StructMembers = type->StructMembers; constant->desc.StructMembers = type->StructMembers;
constant->desc.Bytes = calc_bytes(&constant->desc);
TRACE("class = %d, type = %d, rows = %d, columns = %d, elements = %d, struct_members = %d\n", TRACE("class = %d, type = %d, rows = %d, columns = %d, elements = %d, struct_members = %d\n",
constant->desc.Class, constant->desc.Type, constant->desc.Elements, constant->desc.Class, constant->desc.Type, constant->desc.Elements,
@ -1237,22 +1247,6 @@ HRESULT WINAPI D3DXGetShaderConstantTableEx(CONST DWORD* byte_code,
&object->constants[i]); &object->constants[i]);
if (hr != D3D_OK) if (hr != D3D_OK)
goto error; goto error;
if (constant_info[i].RegisterSet != D3DXRS_FLOAT4 &&
constant_info[i].RegisterSet != D3DXRS_SAMPLER)
FIXME("Don't know how to calculate Bytes for constants of type %d\n",
constant_info[i].RegisterSet);
/*
* D3DXRS_FLOAT4 and D3DXRS_SAMPLER have a base size of 4
* (not taking into account dimensions and element count)
*/
object->constants[i].desc.Bytes = 4;
/* Take into account dimensions and elements */
object->constants[i].desc.Bytes *= object->constants[i].desc.Elements;
object->constants[i].desc.Bytes *= object->constants[i].desc.Rows *
object->constants[i].desc.Columns;
} }
*constant_table = &object->ID3DXConstantTable_iface; *constant_table = &object->ID3DXConstantTable_iface;