[1/2] wined3d: Pass NULL for the stateBlock parameter to shader_get_registers_used() in IWineD3DVertexShaderImpl_SetFunction

H. Verbeet hverbeet at gmail.com
Thu Jun 7 16:52:43 CDT 2007


The stateBlock parameter is only used to determine the sampler types
for pre-2.0 pixel shaders. If it would be used for anything else, the
stateblock we currently pass wouldn't be the right one anyway, so we'd
want to crash.

Changelog:
  - Pass NULL for the stateBlock parameter to
shader_get_registers_used() in IWineD3DVertexShaderImpl_SetFunction
-------------- next part --------------
---

 dlls/wined3d/vertexshader.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c
index 0b9d4cf..fbad6fb 100644
--- a/dlls/wined3d/vertexshader.c
+++ b/dlls/wined3d/vertexshader.c
@@ -562,7 +562,7 @@ static HRESULT WINAPI IWineD3DVertexShaderImpl_SetFunction(IWineD3DVertexShader
     /* Second pass: figure out registers used, semantics, etc.. */
     memset(reg_maps, 0, sizeof(shader_reg_maps));
     hr = shader_get_registers_used((IWineD3DBaseShader*) This, reg_maps,
-       This->semantics_in, This->semantics_out, pFunction, deviceImpl->stateBlock);
+       This->semantics_in, This->semantics_out, pFunction, NULL);
     if (hr != WINED3D_OK) return hr;
 
     This->baseShader.shader_mode = deviceImpl->vs_selected_mode;


More information about the wine-patches mailing list