Henri Verbeet : wined3d: Get rid of glRect from IWineD3DSurfaceImpl.

[Alexandre Julliard]

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

Author: Henri Verbeet 
Date:   Thu Apr 15 19:21:20 2010 +0200

wined3d: Get rid of glRect from IWineD3DSurfaceImpl.

604caf0caae888c5765198416e9b5640a9e64efa supposedly removed the "oversized
texture" code, but this was still left over.

---

dlls/wined3d/device.c          |    4 ----
 dlls/wined3d/surface.c         |   34 +++++++---------------------------
 dlls/wined3d/swapchain.c       |    4 ----
 dlls/wined3d/wined3d_private.h |    3 ---
 4 files changed, 7 insertions(+), 38 deletions(-)

diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 91e595c..986d042 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -6196,10 +6196,6 @@ static HRESULT updateSurfaceDesc(IWineD3DSurfaceImpl *surface, const WINED3DPRES
         while (surface->pow2Width < pPresentationParameters->BackBufferWidth) surface->pow2Width <<= 1;
         while (surface->pow2Height < pPresentationParameters->BackBufferHeight) surface->pow2Height <<= 1;
     }
-    surface->glRect.left = 0;
-    surface->glRect.top = 0;
-    surface->glRect.right = surface->pow2Width;
-    surface->glRect.bottom = surface->pow2Height;

if (surface->texture_name)
     {
diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index fc24bb4..177001e 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -1560,7 +1560,6 @@ static void read_from_framebuffer_texture(IWineD3DSurfaceImpl *This, BOOL srgb)
 void surface_prepare_texture(IWineD3DSurfaceImpl *surface, const struct wined3d_gl_info *gl_info, BOOL srgb)
 {
     DWORD alloc_flag = srgb ? SFLAG_SRGBALLOCATED : SFLAG_ALLOCATED;
-    GLsizei width, height;
     CONVERT_TYPES convert;
     struct wined3d_format_desc desc;

@@ -1570,19 +1569,9 @@ void surface_prepare_texture(IWineD3DSurfaceImpl *surface, const struct wined3d_
     if(convert != NO_CONVERSION) surface->Flags |= SFLAG_CONVERTED;
     else surface->Flags &= ~SFLAG_CONVERTED;

-    if (surface->Flags & SFLAG_NONPOW2)
-    {
-        width = surface->pow2Width;
-        height = surface->pow2Height;
-    }
-    else
-    {
-        width = surface->glRect.right - surface->glRect.left;
-        height = surface->glRect.bottom - surface->glRect.top;
-    }
-
     surface_bind_and_dirtify(surface, srgb);
-    surface_allocate_surface(surface, gl_info, &desc, srgb, width, height);
+    surface_allocate_surface(surface, gl_info, &desc, srgb,
+            surface->pow2Width, surface->pow2Height);
     surface->Flags |= alloc_flag;
 }

@@ -3981,13 +3970,9 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_PrivateSetup(IWineD3DSurface *iface) {

/* We should never use this surface in combination with OpenGL! */
         TRACE("(%p) Creating an oversized surface: %ux%u\n", This, This->pow2Width, This->pow2Height);
-
-        /* This will be initialized on the first blt */
-        This->glRect.left = 0;
-        This->glRect.top = 0;
-        This->glRect.right = 0;
-        This->glRect.bottom = 0;
-    } else {
+    }
+    else
+    {
         /* Don't use ARB_TEXTURE_RECTANGLE in case the surface format is P8 and EXT_PALETTED_TEXTURE
            is used in combination with texture uploads (RTL_READTEX/RTL_TEXTEX). The reason is that EXT_PALETTED_TEXTURE
            doesn't work in combination with ARB_TEXTURE_RECTANGLE.
@@ -4002,11 +3987,6 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_PrivateSetup(IWineD3DSurface *iface) {
             This->pow2Height = This->currentDesc.Height;
             This->Flags &= ~(SFLAG_NONPOW2 | SFLAG_NORMCOORD);
         }
-
-        This->glRect.left = 0;
-        This->glRect.top = 0;
-        This->glRect.right = This->pow2Width;
-        This->glRect.bottom = This->pow2Height;
     }

if(This->resource.usage & WINED3DUSAGE_RENDERTARGET) {
@@ -4548,8 +4528,8 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadLocation(IWineD3DSurface *iface, D
                  */
                 if (mem || (This->Flags & SFLAG_PBO))
                 {
-                    surface_upload_data(This, gl_info, &desc, srgb, This->glRect.right - This->glRect.left,
-                            This->glRect.bottom - This->glRect.top, mem);
+                    surface_upload_data(This, gl_info, &desc, srgb,
+                            This->pow2Width, This->pow2Height, mem);
                 }
             }

diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c
index 1265abc..9929037 100644
--- a/dlls/wined3d/swapchain.c
+++ b/dlls/wined3d/swapchain.c
@@ -256,10 +256,6 @@ static HRESULT WINAPI IWineD3DSwapChainImpl_Present(IWineD3DSwapChain *iface, CO
         cursor.texture_level = 0;
         cursor.currentDesc.Width = This->device->cursorWidth;
         cursor.currentDesc.Height = This->device->cursorHeight;
-        cursor.glRect.left = 0;
-        cursor.glRect.top = 0;
-        cursor.glRect.right = cursor.currentDesc.Width;
-        cursor.glRect.bottom = cursor.currentDesc.Height;
         /* The cursor must have pow2 sizes */
         cursor.pow2Width = cursor.currentDesc.Width;
         cursor.pow2Height = cursor.currentDesc.Height;
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 4652be5..dc57762 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -2065,9 +2065,6 @@ struct IWineD3DSurfaceImpl
     /* A method to retrieve the drawable size. Not in the Vtable to make it changeable */
     void (*get_drawable_size)(struct wined3d_context *context, UINT *width, UINT *height);

-    /* Oversized texture */
-    RECT                      glRect;
-
     /* PBO */
     GLuint                    pbo;
     GLuint texture_name;