Henri Verbeet : wined3d: The currentDesc and pow2 width/ height are the same for power of two textures.

[Alexandre Julliard]

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

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

wined3d: The currentDesc and pow2 width/height are the same for power of two textures.

---

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

diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index 177001e..182e219 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -4515,22 +4515,10 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadLocation(IWineD3DSurface *iface, D
             glPixelStorei(GL_UNPACK_ROW_LENGTH, width);
             LEAVE_GL();

-            if (This->Flags & SFLAG_NONPOW2) {
-                TRACE("non power of two support\n");
-                if (mem || (This->Flags & SFLAG_PBO))
-                {
-                    surface_upload_data(This, gl_info, &desc, srgb,
-                            This->currentDesc.Width, This->currentDesc.Height, mem);
-                }
-            } else {
-                /* When making the realloc conditional, keep in mind that GL_APPLE_client_storage may be in use, and This->resource.allocatedMemory
-                 * changed. So also keep track of memory changes. In this case the texture has to be reallocated
-                 */
-                if (mem || (This->Flags & SFLAG_PBO))
-                {
-                    surface_upload_data(This, gl_info, &desc, srgb,
-                            This->pow2Width, This->pow2Height, mem);
-                }
+            if (mem || (This->Flags & SFLAG_PBO))
+            {
+                surface_upload_data(This, gl_info, &desc, srgb,
+                        This->currentDesc.Width, This->currentDesc.Height, mem);
             }

/* Restore the default pitch */