Henri Verbeet : wined3d: Properly enable / disable register combiners.
Alexandre Julliard
julliard at winehq.org
Fri Jan 20 13:09:28 CST 2012
Module: wine
Branch: master
Commit: d1254eddb598ad2a6bddaf09ddb5d73247d460cc
URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1254eddb598ad2a6bddaf09ddb5d73247d460cc
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Fri Jan 20 00:36:25 2012 +0100
wined3d: Properly enable / disable register combiners.
---
dlls/wined3d/nvidia_texture_shader.c | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/dlls/wined3d/nvidia_texture_shader.c b/dlls/wined3d/nvidia_texture_shader.c
index dc3f8b9..1fef980 100644
--- a/dlls/wined3d/nvidia_texture_shader.c
+++ b/dlls/wined3d/nvidia_texture_shader.c
@@ -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)");
}
More information about the wine-cvs
mailing list