Henri Verbeet : wined3d: Get rid of the width and height parameters to surface_upload_data().

[Alexandre Julliard]

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

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

wined3d: Get rid of the width and height parameters to surface_upload_data().

---

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

diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index 7c95530..0ac29c8 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -720,8 +720,10 @@ static void surface_download_data(IWineD3DSurfaceImpl *This, const struct wined3
  * correct texture. */
 /* Context activation is done by the caller. */
 static void surface_upload_data(IWineD3DSurfaceImpl *This, const struct wined3d_gl_info *gl_info,
-        const struct wined3d_format_desc *format_desc, BOOL srgb, GLsizei width, GLsizei height, const GLvoid *data)
+        const struct wined3d_format_desc *format_desc, BOOL srgb, const GLvoid *data)
 {
+    GLsizei width = This->currentDesc.Width;
+    GLsizei height = This->currentDesc.Height;
     GLenum internal;

if (srgb)
@@ -4517,10 +4519,7 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadLocation(IWineD3DSurface *iface, D
             LEAVE_GL();

if (mem || (This->Flags & SFLAG_PBO))
-            {
-                surface_upload_data(This, gl_info, &desc, srgb,
-                        This->currentDesc.Width, This->currentDesc.Height, mem);
-            }
+                surface_upload_data(This, gl_info, &desc, srgb, mem);

/* Restore the default pitch */
             ENTER_GL();