Alexander Dorofeyev : wined3d: Remove glDrawBuffer calls in BltOverride.

Alexandre Julliard julliard at winehq.org
Thu Sep 4 08:27:09 CDT 2008


Module: wine
Branch: master
Commit: 7c38816819178e517d150110e7520dc8ed0ad1c1
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=7c38816819178e517d150110e7520dc8ed0ad1c1

Author: Alexander Dorofeyev <alexd4 at inbox.lv>
Date:   Wed Sep  3 23:59:46 2008 +0300

wined3d: Remove glDrawBuffer calls in BltOverride.

Handled in ActivateContext, must be remains of pre-context management code.

---

 dlls/wined3d/surface.c |   10 ----------
 1 files changed, 0 insertions(+), 10 deletions(-)

diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index 283b159..31cb368 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -3468,9 +3468,6 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, RECT *
         }
 
         ENTER_GL();
-        glDrawBuffer(buffer);
-        checkGLcall("glDrawBuffer");
-
         myDevice->blitter->set_shader((IWineD3DDevice *) myDevice, Src->resource.format,
                                        Src->glDescription.target, Src->pow2Width, Src->pow2Height);
 
@@ -3543,13 +3540,6 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, RECT *
         /* Leave the opengl state valid for blitting */
         myDevice->blitter->unset_shader((IWineD3DDevice *) myDevice);
 
-        /* The draw buffer should only need to be restored if we were drawing to the front buffer, and there is a back buffer.
-         * otherwise the context manager should choose between GL_BACK / offscreenDrawBuffer
-         */
-        if(dstSwapchain && This == (IWineD3DSurfaceImpl *) dstSwapchain->frontBuffer && dstSwapchain->backBuffer) {
-            glDrawBuffer(GL_BACK);
-            checkGLcall("glDrawBuffer");
-        }
         /* Restore the color key parameters */
         Src->CKeyFlags = oldCKeyFlags;
         Src->SrcBltCKey = oldBltCKey;




More information about the wine-cvs mailing list