system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-16 02:16:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

wined3d: Compile pixel shaders in drawprim.

Browse source
This commit is contained in:
Stefan Dösinger 2006-08-24 23:55:23 +02:00 committed by Alexandre Julliard
parent 4e92e29ce9
commit 0b7a96e92b
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
dlls/wined3d/drawprim.c
View file

@ -1796,6 +1796,13 @@ inline static void drawPrimitiveDrawStrided(
useDrawStridedSlow = TRUE;
}
if(usePixelShaderFunction) {
/* We compile the shader here because it depends on the texture stage state
* setup of the bound textures. If the shader is already compiled and the texture stage
* state setup matches the program this function will do nothing
*/
IWineD3DPixelShader_CompileShader(This->stateBlock->pixelShader);
}
/* If GLSL is used for either pixel or vertex shaders, make a GLSL program
* Otherwise set NULL, to restore fixed function */
if ((wined3d_settings.vs_selected_mode == SHADER_GLSL && useVertexShaderFunction) ||

3
dlls/wined3d/pixelshader.c
View file

@ -949,9 +949,6 @@ static HRESULT WINAPI IWineD3DPixelShaderImpl_SetFunction(IWineD3DPixelShader *i
This->baseShader.function = NULL;
}
/* Compile the shader. */
IWineD3DPixelShader_CompileShader(iface);
return WINED3D_OK;
}