Roderick Colenbrander : wined3d: Use EXT-versions of glBlend*.
Module: wine Branch: master Commit: c2bf124a90b7f02dd87cddc7d86bf16e1d0b761f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2bf124a90b7f02dd87cddc7d8... Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sat Oct 6 17:42:39 2007 +0200 wined3d: Use EXT-versions of glBlend*. --- dlls/wined3d/state.c | 4 ++-- include/wine/wined3d_gl.h | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 929260b..d9a2684 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -332,7 +332,7 @@ static void state_blendfactor(DWORD state, IWineD3DStateBlockImpl *stateblock, W TRACE("Setting BlendFactor to %d\n", stateblock->renderState[WINED3DRS_BLENDFACTOR]); D3DCOLORTOGLFLOAT4(stateblock->renderState[WINED3DRS_BLENDFACTOR], col); - GL_EXTCALL(glBlendColor (col[0],col[1],col[2],col[3])); + GL_EXTCALL(glBlendColorEXT (col[0],col[1],col[2],col[3])); checkGLcall("glBlendColor"); } @@ -481,7 +481,7 @@ static void state_blendop(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD } TRACE("glBlendEquation(%x)\n", glParm); - GL_EXTCALL(glBlendEquation(glParm)); + GL_EXTCALL(glBlendEquationEXT(glParm)); checkGLcall("glBlendEquation"); } diff --git a/include/wine/wined3d_gl.h b/include/wine/wined3d_gl.h index 3da14ef..5354fef 100644 --- a/include/wine/wined3d_gl.h +++ b/include/wine/wined3d_gl.h @@ -3222,9 +3222,9 @@ typedef enum _GL_SupportedExt { /** ARB Extensions **/ \ /* GL_ARB_draw_buffers */ \ USE_GL_FUNC(PGLFNDRAWBUFFERSARBPROC, glDrawBuffersARB); \ - /* GL_ARB_imaging */ \ - USE_GL_FUNC(PGLFNBLENDCOLORPROC, glBlendColor); \ - USE_GL_FUNC(PGLFNBLENDEQUATIONPROC, glBlendEquation); \ + /* GL_ARB_imaging, GL_EXT_blend_minmax */ \ + USE_GL_FUNC(PGLFNBLENDCOLORPROC, glBlendColorEXT); \ + USE_GL_FUNC(PGLFNBLENDEQUATIONPROC, glBlendEquationEXT); \ /* GL_ARB_multisample */ \ USE_GL_FUNC(WINED3D_PFNGLSAMPLECOVERAGEARBPROC, glSampleCoverageARB); \ /* GL_ARB_multitexture */ \
participants (1)
-
Alexandre Julliard