Module: wine Branch: refs/heads/master Commit: a187ab05c4acd36db52554b2e23e51b12e809516 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a187ab05c4acd36db52554b2...
Author: Roderick Colenbrander thunderbird2k@gmx.net Date: Sun Mar 19 23:38:23 2006 +0100
wined3d: Don't use OpenGL 2.0.
---
dlls/wined3d/device.c | 20 ++++++++++++++++---- include/wine/wined3d_gl.h | 6 +++++- 2 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 3c946cd..ea74a20 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3166,11 +3166,14 @@ HRESULT WINAPI IWineD3DDeviceImpl_SetRen } This->stencilfunc = func; if(!This->stateBlock->renderState[WINED3DRS_TWOSIDEDSTENCILMODE]) { +#if 0 /* Don't use OpenGL 2.0 calls for now */ if(GL_EXTCALL(glStencilFuncSeparate)) { GL_EXTCALL(glStencilFuncSeparate(GL_FRONT, func, ref, mask)); checkGLcall("glStencilFuncSeparate(GL_FRONT,...)"); } - else if(GL_SUPPORT(EXT_STENCIL_TWO_SIDE)) { + else +#endif + if(GL_SUPPORT(EXT_STENCIL_TWO_SIDE)) { glEnable(GL_STENCIL_TEST_TWO_SIDE_EXT); checkGLcall("glEnable(GL_STENCIL_TEST_TWO_SIDE_EXT)"); GL_EXTCALL(glActiveStencilFaceEXT(GL_FRONT)); @@ -3242,11 +3245,14 @@ HRESULT WINAPI IWineD3DDeviceImpl_SetRen }
if(!This->stateBlock->renderState[WINED3DRS_TWOSIDEDSTENCILMODE]) { +#if 0 /* Don't use OpenGL 2.0 calls for now */ if(GL_EXTCALL(glStencilOpSeparate)) { GL_EXTCALL(glStencilOpSeparate(GL_FRONT, stencilFail, depthFail, stencilPass)); checkGLcall("glStencilOpSeparate(GL_FRONT,...)"); } - else if(GL_SUPPORT(EXT_STENCIL_TWO_SIDE)) { + else +#endif + if(GL_SUPPORT(EXT_STENCIL_TWO_SIDE)) { glEnable(GL_STENCIL_TEST_TWO_SIDE_EXT); checkGLcall("glEnable(GL_STENCIL_TEST_TWO_SIDE_EXT)"); GL_EXTCALL(glActiveStencilFaceEXT(GL_FRONT)); @@ -3789,11 +3795,14 @@ HRESULT WINAPI IWineD3DDeviceImpl_SetRen }
if(!This->stateBlock->renderState[WINED3DRS_TWOSIDEDSTENCILMODE]) { +#if 0 /* Don't use OpenGL 2.0 calls for now */ if(GL_EXTCALL(glStencilOpSeparate)) { GL_EXTCALL(glStencilOpSeparate(GL_BACK, stencilFail, depthFail, stencilPass)); checkGLcall("glStencilOpSeparate(GL_BACK,...)"); } - else if(GL_SUPPORT(EXT_STENCIL_TWO_SIDE)) { + else +#endif + if(GL_SUPPORT(EXT_STENCIL_TWO_SIDE)) { glEnable(GL_STENCIL_TEST_TWO_SIDE_EXT); checkGLcall("glEnable(GL_STENCIL_TEST_TWO_SIDE_EXT)"); GL_EXTCALL(glActiveStencilFaceEXT(GL_BACK)); @@ -3836,11 +3845,14 @@ HRESULT WINAPI IWineD3DDeviceImpl_SetRen } This->stencilfunc = func; if(!This->stateBlock->renderState[WINED3DRS_TWOSIDEDSTENCILMODE]) { +#if 0 /* Don't use OpenGL 2.0 calls for now */ if(GL_EXTCALL(glStencilFuncSeparate)) { GL_EXTCALL(glStencilFuncSeparate(GL_BACK, func, ref, mask)); checkGLcall("glStencilFuncSeparate(GL_BACK,...)"); } - else if(GL_SUPPORT(EXT_STENCIL_TWO_SIDE)) { + else +#endif + if(GL_SUPPORT(EXT_STENCIL_TWO_SIDE)) { glEnable(GL_STENCIL_TEST_TWO_SIDE_EXT); checkGLcall("glEnable(GL_STENCIL_TEST_TWO_SIDE_EXT)"); GL_EXTCALL(glActiveStencilFaceEXT(GL_BACK)); diff --git a/include/wine/wined3d_gl.h b/include/wine/wined3d_gl.h index 08ab4a8..63e79ee 100644 --- a/include/wine/wined3d_gl.h +++ b/include/wine/wined3d_gl.h @@ -1237,7 +1237,9 @@ typedef enum _GL_SupportedExt { /* GL_ATI_separate_stencil */ \ USE_GL_FUNC(PGLFNSTENCILOPSEPARATEATIPROC, glStencilOpSeparateATI); \ USE_GL_FUNC(PGLFNSTENCILFUNCSEPARATEATIPROC, glStencilFuncSeparateATI); \ - /* GL_VERSION_2_0 */ \ + +/* OpenGL 2.0 functions */ +#define GL2_FUNCS_GEN \ USE_GL_FUNC(PGLFNBLENDEQUATIONSEPARATEPROC, glBlendEquationSeparate); \ USE_GL_FUNC(PGLFNDRAWBUFFERSPROC, glDrawBuffers); \ USE_GL_FUNC(PGLFNSTENCILOPSEPARATEPROC, glStencilOpSeparate); \ @@ -1388,6 +1390,8 @@ typedef struct _WineD3D_GL_Info { GL_EXT_FUNCS_GEN; /** OpenGL GLX functions ptr */ GLX_EXT_FUNCS_GEN; + /** OpenGL 2.0 functions ptr */ + /* GL2_FUNCS_GEN; */ /**/ } WineD3D_GL_Info; #undef USE_GL_FUNC
-
Alexandre Julliard