Stefan Dösinger : wined3d: ScissorRect correction.

[Alexandre Julliard]

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

Author: Stefan Dösinger 
Date:   Mon Nov  6 14:28:15 2006 +0100

wined3d: ScissorRect correction.

---

dlls/wined3d/device.c |   16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 6727152..794cba3 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -4650,11 +4650,19 @@ static HRESULT WINAPI IWineD3DDeviceImpl

static HRESULT WINAPI IWineD3DDeviceImpl_SetScissorRect(IWineD3DDevice *iface, CONST RECT* pRect) {
     IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface;
-    ENTER_GL();
+    RECT windowRect;
+    UINT winHeight;

-    /** FIXME: Windows uses a top,left origin openGL uses a bottom Right? **/
-    TRACE("(%p)Setting new Scissor Rect to %d:%d-%d:%d\n", This, pRect->left, pRect->top, pRect->right, pRect->bottom);
-    glScissor(pRect->left, pRect->top, pRect->right - pRect->left, pRect->bottom - pRect->top);
+    GetClientRect(((IWineD3DSwapChainImpl *)This->swapchains[0])->win_handle, &windowRect);
+    /* Warning: glScissor uses window coordinates, not viewport coordinates, so our viewport correction does not apply
+    * Warning2: Even in windowed mode the coords are relative to the window, not the screen
+    */
+    winHeight = windowRect.bottom - windowRect.top;
+    TRACE("(%p)Setting new Scissor Rect to %d:%d-%d:%d\n", This, pRect->left, pRect->bottom - winHeight,
+          pRect->right - pRect->left, pRect->bottom - pRect->top);
+    ENTER_GL();
+    glScissor(pRect->left, winHeight - pRect->bottom, pRect->right - pRect->left, pRect->bottom - pRect->top);
+    checkGLcall("glScissor");
     LEAVE_GL();

return WINED3D_OK;