From ac6f401056fa761bda4aeb5335e2465f5c74ea33 Mon Sep 17 00:00:00 2001 From: Raphael Junqueira Date: Mon, 14 Jun 2004 16:57:41 +0000 Subject: [PATCH] - fix version string - some fixes to ATI specific paths of set_tex_op (Christian needs to complete it) - fix use of GL_SUPPORT(NV_TEXGEN_REFLECTION). I have used the wrong define, I'll get a brown paper bag :( --- dlls/d3d8/device.c | 4 +-- dlls/d3d8/utils.c | 70 ++++++++++++++++++++++++++-------------------------- dlls/d3d8/version.rc | 2 +- 3 files changed, 38 insertions(+), 38 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 2e111c6cd76..c614b985c80 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -3703,7 +3703,7 @@ HRESULT WINAPI IDirect3DDevice8Impl_SetTextureStageState(LPDIRECT3DDEVICE8 ifa case D3DTSS_TCI_CAMERASPACENORMAL: { - if (GL_SUPPORT(GL_NV_texgen_reflection)) { + if (GL_SUPPORT(NV_TEXGEN_REFLECTION)) { float s_plane[] = { 1.0, 0.0, 0.0, 0.0 }; float t_plane[] = { 0.0, 1.0, 0.0, 0.0 }; float r_plane[] = { 0.0, 0.0, 1.0, 0.0 }; @@ -3737,7 +3737,7 @@ HRESULT WINAPI IDirect3DDevice8Impl_SetTextureStageState(LPDIRECT3DDEVICE8 ifa case D3DTSS_TCI_CAMERASPACEREFLECTIONVECTOR: { - if (GL_SUPPORT(GL_NV_texgen_reflection)) { + if (GL_SUPPORT(NV_TEXGEN_REFLECTION)) { float s_plane[] = { 1.0, 0.0, 0.0, 0.0 }; float t_plane[] = { 0.0, 1.0, 0.0, 0.0 }; float r_plane[] = { 0.0, 0.0, 1.0, 0.0 }; diff --git a/dlls/d3d8/utils.c b/dlls/d3d8/utils.c index 11f3d15379a..440a8f9ced8 100644 --- a/dlls/d3d8/utils.c +++ b/dlls/d3d8/utils.c @@ -1019,13 +1019,13 @@ void set_tex_op(LPDIRECT3DDEVICE8 iface, BOOL isAlpha, int Stage, D3DTEXTUREOP o glTexEnvi(GL_TEXTURE_ENV, src3_target, src1); checkGLcall("GL_TEXTURE_ENV, src3_target, src1"); switch (opr1) { - case GL_SRC_COLOR: opr1 = GL_ONE_MINUS_SRC_COLOR; break; - case GL_ONE_MINUS_SRC_COLOR: opr1 = GL_SRC_COLOR; break; - case GL_SRC_ALPHA: opr1 = GL_ONE_MINUS_SRC_ALPHA; break; - case GL_ONE_MINUS_SRC_ALPHA: opr1 = GL_SRC_ALPHA; break; + case GL_SRC_COLOR: opr = GL_ONE_MINUS_SRC_COLOR; break; + case GL_ONE_MINUS_SRC_COLOR: opr = GL_SRC_COLOR; break; + case GL_SRC_ALPHA: opr = GL_ONE_MINUS_SRC_ALPHA; break; + case GL_ONE_MINUS_SRC_ALPHA: opr = GL_SRC_ALPHA; break; } - glTexEnvi(GL_TEXTURE_ENV, opr3_target, opr1); - checkGLcall("GL_TEXTURE_ENV, opr3_target, opr1"); + glTexEnvi(GL_TEXTURE_ENV, opr3_target, opr); + checkGLcall("GL_TEXTURE_ENV, opr3_target, opr"); glTexEnvi(GL_TEXTURE_ENV, scal_target, 1); checkGLcall("GL_TEXTURE_ENV, scal_target, 1"); break; @@ -1135,12 +1135,12 @@ void set_tex_op(LPDIRECT3DDEVICE8 iface, BOOL isAlpha, int Stage, D3DTEXTUREOP o checkGLcall("GL_TEXTURE_ENV, opr2_target, opr2"); /* a3 = src1 alpha */ glTexEnvi(GL_TEXTURE_ENV, src3_target, src1); checkGLcall("GL_TEXTURE_ENV, src3_target, src1"); - switch (opr1) { - case GL_SRC_COLOR: opr1 = GL_SRC_ALPHA; break; - case GL_ONE_MINUS_SRC_COLOR: opr1 = GL_ONE_MINUS_SRC_ALPHA; break; + switch (opr) { + case GL_SRC_COLOR: opr = GL_SRC_ALPHA; break; + case GL_ONE_MINUS_SRC_COLOR: opr = GL_ONE_MINUS_SRC_ALPHA; break; } - glTexEnvi(GL_TEXTURE_ENV, opr3_target, opr1); - checkGLcall("GL_TEXTURE_ENV, opr3_target, opr1"); + glTexEnvi(GL_TEXTURE_ENV, opr3_target, opr); + checkGLcall("GL_TEXTURE_ENV, opr3_target, opr"); glTexEnvi(GL_TEXTURE_ENV, scal_target, 1); checkGLcall("GL_TEXTURE_ENV, scal_target, 1"); break; @@ -1158,11 +1158,11 @@ void set_tex_op(LPDIRECT3DDEVICE8 iface, BOOL isAlpha, int Stage, D3DTEXTUREOP o glTexEnvi(GL_TEXTURE_ENV, src2_target, src1); checkGLcall("GL_TEXTURE_ENV, src2_target, src1"); switch (opr1) { - case GL_SRC_COLOR: opr1 = GL_SRC_ALPHA; break; - case GL_ONE_MINUS_SRC_COLOR: opr1 = GL_ONE_MINUS_SRC_ALPHA; break; + case GL_SRC_COLOR: opr = GL_SRC_ALPHA; break; + case GL_ONE_MINUS_SRC_COLOR: opr = GL_ONE_MINUS_SRC_ALPHA; break; } - glTexEnvi(GL_TEXTURE_ENV, opr2_target, opr1); - checkGLcall("GL_TEXTURE_ENV, opr2_target, opr1"); + glTexEnvi(GL_TEXTURE_ENV, opr2_target, opr); + checkGLcall("GL_TEXTURE_ENV, opr2_target, opr"); glTexEnvi(GL_TEXTURE_ENV, src3_target, GL_ZERO); checkGLcall("GL_TEXTURE_ENV, src3_target, GL_ZERO"); glTexEnvi(GL_TEXTURE_ENV, opr3_target, invopr); @@ -1218,11 +1218,11 @@ void set_tex_op(LPDIRECT3DDEVICE8 iface, BOOL isAlpha, int Stage, D3DTEXTUREOP o glTexEnvi(GL_TEXTURE_ENV, src2_target, src1); checkGLcall("GL_TEXTURE_ENV, src2_target, src1"); switch (opr1) { - case GL_SRC_COLOR: opr1 = GL_SRC_ALPHA; break; - case GL_ONE_MINUS_SRC_COLOR: opr1 = GL_ONE_MINUS_SRC_ALPHA; break; + case GL_SRC_COLOR: opr = GL_SRC_ALPHA; break; + case GL_ONE_MINUS_SRC_COLOR: opr = GL_ONE_MINUS_SRC_ALPHA; break; } - glTexEnvi(GL_TEXTURE_ENV, opr2_target, opr1); - checkGLcall("GL_TEXTURE_ENV, opr2_target, opr1"); + glTexEnvi(GL_TEXTURE_ENV, opr2_target, opr); + checkGLcall("GL_TEXTURE_ENV, opr2_target, opr"); glTexEnvi(GL_TEXTURE_ENV, src3_target, GL_ZERO); checkGLcall("GL_TEXTURE_ENV, src3_target, GL_ZERO"); glTexEnvi(GL_TEXTURE_ENV, opr3_target, invopr); @@ -1678,13 +1678,13 @@ void set_tex_op(LPDIRECT3DDEVICE8 iface, BOOL isAlpha, int Stage, D3DTEXTUREOP o glTexEnvi(GL_TEXTURE_ENV, opr0_target, opr1); checkGLcall("GL_TEXTURE_ENV, opr0_target, opr1"); glTexEnvi(GL_TEXTURE_ENV, src1_target, src1); - checkGLcall("GL_TEXTURE_ENV, src1_target, src2"); - glTexEnvi(GL_TEXTURE_ENV, opr1_target, opr1); - checkGLcall("GL_TEXTURE_ENV, opr1_target, opr2"); - glTexEnvi(GL_TEXTURE_ENV, src2_target, src1); - checkGLcall("GL_TEXTURE_ENV, src2_target, src1"); - glTexEnvi(GL_TEXTURE_ENV, opr2_target, GL_SRC_ALPHA); - checkGLcall("GL_TEXTURE_ENV, opr2_target, GL_SRC_ALPHA"); + checkGLcall("GL_TEXTURE_ENV, src1_target, src1"); + glTexEnvi(GL_TEXTURE_ENV, opr1_target, GL_SRC_ALPHA); + checkGLcall("GL_TEXTURE_ENV, opr1_target, GL_SRC_ALPHA"); + glTexEnvi(GL_TEXTURE_ENV, src2_target, src2); + checkGLcall("GL_TEXTURE_ENV, src2_target, src2"); + glTexEnvi(GL_TEXTURE_ENV, opr2_target, opr2); + checkGLcall("GL_TEXTURE_ENV, opr2_target, opr2"); glTexEnvi(GL_TEXTURE_ENV, scal_target, 1); checkGLcall("GL_TEXTURE_ENV, scal_target, 1"); } else @@ -1717,16 +1717,16 @@ void set_tex_op(LPDIRECT3DDEVICE8 iface, BOOL isAlpha, int Stage, D3DTEXTUREOP o checkGLcall("GL_TEXTURE_ENV, comb_target, GL_MODULATE_ADD_ATI"); glTexEnvi(GL_TEXTURE_ENV, src0_target, src1); checkGLcall("GL_TEXTURE_ENV, src0_target, src1"); - glTexEnvi(GL_TEXTURE_ENV, opr0_target, opr1); - checkGLcall("GL_TEXTURE_ENV, opr0_target, opr1"); + glTexEnvi(GL_TEXTURE_ENV, opr0_target, GL_ONE_MINUS_SRC_COLOR); + checkGLcall("GL_TEXTURE_ENV, opr0_target, GL_ONE_MINUS_SRC_COLOR"); glTexEnvi(GL_TEXTURE_ENV, src1_target, src1); - checkGLcall("GL_TEXTURE_ENV, src1_target, src2"); - glTexEnvi(GL_TEXTURE_ENV, opr1_target, opr1); - checkGLcall("GL_TEXTURE_ENV, opr1_target, opr2"); - glTexEnvi(GL_TEXTURE_ENV, src2_target, src1); - checkGLcall("GL_TEXTURE_ENV, src2_target, src1"); - glTexEnvi(GL_TEXTURE_ENV, opr2_target, GL_ONE_MINUS_SRC_ALPHA); - checkGLcall("GL_TEXTURE_ENV, opr2_target, GL_ONE_MINUS_SRC_ALPHA"); + checkGLcall("GL_TEXTURE_ENV, src1_target, src1"); + glTexEnvi(GL_TEXTURE_ENV, opr1_target, GL_SRC_ALPHA); + checkGLcall("GL_TEXTURE_ENV, opr1_target, GL_SRC_ALPHA"); + glTexEnvi(GL_TEXTURE_ENV, src2_target, src2); + checkGLcall("GL_TEXTURE_ENV, src2_target, src2"); + glTexEnvi(GL_TEXTURE_ENV, opr2_target, opr2); + checkGLcall("GL_TEXTURE_ENV, opr2_target, opr2"); glTexEnvi(GL_TEXTURE_ENV, scal_target, 1); checkGLcall("GL_TEXTURE_ENV, scal_target, 1"); } else diff --git a/dlls/d3d8/version.rc b/dlls/d3d8/version.rc index 61d922a9edc..68466485521 100644 --- a/dlls/d3d8/version.rc +++ b/dlls/d3d8/version.rc @@ -21,7 +21,7 @@ #define WINE_FILEVERSION 5,3,0,900 #define WINE_FILEVERSION_STR "5.3.0.900" #define WINE_PRODUCTVERSION 5,3,0,900 -#define WINE_PRODUCTVERSION_STR "5.3" +#define WINE_PRODUCTVERSION_STR "5.3.0.900" #define WINE_PRODUCTNAME_STR "DirectX" #include "wine/wine_common_ver.rc" -- 2.11.4.GIT