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

wined3d: Explicitly pass the shader version to shader_dump_decl_usage().

This commit is contained in:
Henri Verbeet 2008-12-04 17:41:31 +01:00 committed by Alexandre Julliard
parent a13df0e4ef
commit 71a8a77cf9
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dlls/wined3d/baseshader.c
View File

@ -491,11 +491,8 @@ HRESULT shader_get_registers_used(
return WINED3D_OK; return WINED3D_OK;
} }
static void shader_dump_decl_usage( static void shader_dump_decl_usage(DWORD decl, DWORD param, DWORD shader_version)
IWineD3DBaseShaderImpl* This, {
DWORD decl,
DWORD param) {
DWORD regtype = shader_get_regtype(param); DWORD regtype = shader_get_regtype(param);
TRACE("dcl"); TRACE("dcl");
@ -516,8 +513,7 @@ static void shader_dump_decl_usage(
DWORD idx = (decl & WINED3DSP_DCL_USAGEINDEX_MASK) >> WINED3DSP_DCL_USAGEINDEX_SHIFT; DWORD idx = (decl & WINED3DSP_DCL_USAGEINDEX_MASK) >> WINED3DSP_DCL_USAGEINDEX_SHIFT;
/* Pixel shaders 3.0 don't have usage semantics */ /* Pixel shaders 3.0 don't have usage semantics */
char pshader = shader_is_pshader_version(This->baseShader.hex_version); if (shader_is_pshader_version(shader_version) && shader_version < WINED3DPS_VERSION(3,0))
if (pshader && This->baseShader.hex_version < WINED3DPS_VERSION(3,0))
return; return;
else else
TRACE("_"); TRACE("_");
@ -1027,7 +1023,7 @@ void shader_trace_init(
DWORD usage = *pToken; DWORD usage = *pToken;
DWORD param = *(pToken + 1); DWORD param = *(pToken + 1);
shader_dump_decl_usage(This, usage, param); shader_dump_decl_usage(usage, param, This->baseShader.hex_version);
shader_dump_ins_modifiers(param); shader_dump_ins_modifiers(param);
TRACE(" "); TRACE(" ");
shader_dump_param(iface, param, 0, 0); shader_dump_param(iface, param, 0, 0);