Stefan Dösinger : wined3d: Add some missing checkGLcall calls.
Alexandre Julliard
julliard at winehq.org
Wed Nov 28 08:01:43 CST 2007
Module: wine
Branch: master
Commit: 0353d031bc39393f59d47214eec3231fd2bc3554
URL: http://source.winehq.org/git/wine.git/?a=commit;h=0353d031bc39393f59d47214eec3231fd2bc3554
Author: Stefan Dösinger <stefan at codeweavers.com>
Date: Fri Nov 23 00:22:00 2007 +0100
wined3d: Add some missing checkGLcall calls.
---
dlls/wined3d/state.c | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c
index 0d735cb..ce1453d 100644
--- a/dlls/wined3d/state.c
+++ b/dlls/wined3d/state.c
@@ -1688,6 +1688,7 @@ static void activate_dimensions(DWORD stage, IWineD3DStateBlockImpl *stateblock,
case GL_TEXTURE_2D:
if(GL_SUPPORT(NV_TEXTURE_SHADER2)) {
glTexEnvi(GL_TEXTURE_SHADER_NV, GL_SHADER_OPERATION_NV, bumpmap ? GL_OFFSET_TEXTURE_2D_NV : GL_TEXTURE_2D);
+ checkGLcall("glTexEnvi(GL_TEXTURE_SHADER_NV, GL_SHADER_OPERATION_NV, ...)");
} else {
glDisable(GL_TEXTURE_3D);
checkGLcall("glDisable(GL_TEXTURE_3D)");
@@ -1702,6 +1703,7 @@ static void activate_dimensions(DWORD stage, IWineD3DStateBlockImpl *stateblock,
case GL_TEXTURE_3D:
if(GL_SUPPORT(NV_TEXTURE_SHADER2)) {
glTexEnvi(GL_TEXTURE_SHADER_NV, GL_SHADER_OPERATION_NV, GL_TEXTURE_3D);
+ checkGLcall("glTexEnvi(GL_TEXTURE_SHADER_NV, GL_SHADER_OPERATION_NV, GL_TEXTURE_3D)");
} else {
if(GL_SUPPORT(ARB_TEXTURE_CUBE_MAP)) {
glDisable(GL_TEXTURE_CUBE_MAP_ARB);
@@ -1716,6 +1718,7 @@ static void activate_dimensions(DWORD stage, IWineD3DStateBlockImpl *stateblock,
case GL_TEXTURE_CUBE_MAP_ARB:
if(GL_SUPPORT(NV_TEXTURE_SHADER2)) {
glTexEnvi(GL_TEXTURE_SHADER_NV, GL_SHADER_OPERATION_NV, GL_TEXTURE_CUBE_MAP_ARB);
+ checkGLcall("glTexEnvi(GL_TEXTURE_SHADER_NV, GL_SHADER_OPERATION_NV, GL_TEXTURE_CUBE_MAP_ARB)");
} else {
glDisable(GL_TEXTURE_2D);
checkGLcall("glDisable(GL_TEXTURE_2D)");
@@ -1729,6 +1732,7 @@ static void activate_dimensions(DWORD stage, IWineD3DStateBlockImpl *stateblock,
} else {
if(GL_SUPPORT(NV_TEXTURE_SHADER2)) {
glTexEnvi(GL_TEXTURE_SHADER_NV, GL_SHADER_OPERATION_NV, GL_NONE);
+ checkGLcall("glTexEnvi(GL_TEXTURE_SHADER_NV, GL_SHADER_OPERATION_NV, GL_NONE)");
} else {
glEnable(GL_TEXTURE_2D);
checkGLcall("glEnable(GL_TEXTURE_2D)");
More information about the wine-cvs
mailing list