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

wined3d: Properly enable / disable register combiners.

This commit is contained in:
Henri Verbeet 2012-01-20 00:36:25 +01:00 committed by Alexandre Julliard
parent da35622b83
commit d1254eddb5
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
dlls/wined3d/nvidia_texture_shader.c
View File

@ -629,15 +629,31 @@ static void nvrc_texfactor(struct wined3d_context *context, const struct wined3d
}
/* Context activation is done by the caller. */
static void nvrc_enable(BOOL enable) {}
static void nvrc_enable(BOOL enable)
{
if (enable)
{
glEnable(GL_REGISTER_COMBINERS_NV);
checkGLcall("glEnable(GL_REGISTER_COMBINERS_NV)");
}
else
{
glDisable(GL_REGISTER_COMBINERS_NV);
checkGLcall("glDisable(GL_REGISTER_COMBINERS_NV)");
}
}
/* Context activation and GL locking are done by the caller. */
static void nvts_enable(BOOL enable)
{
if(enable) {
nvrc_enable(enable);
if (enable)
{
glEnable(GL_TEXTURE_SHADER_NV);
checkGLcall("glEnable(GL_TEXTURE_SHADER_NV)");
} else {
}
else
{
glDisable(GL_TEXTURE_SHADER_NV);
checkGLcall("glDisable(GL_TEXTURE_SHADER_NV)");
}