Henri Verbeet : wined3d: Get rid of the width and height parameters to surface_allocate_surface().
Alexandre Julliard
julliard at winehq.org
Fri Apr 16 10:56:00 CDT 2010
Module: wine
Branch: master
Commit: 212bfab2dfb586f5563a9fe95cfee6112ee18219
URL: http://source.winehq.org/git/wine.git/?a=commit;h=212bfab2dfb586f5563a9fe95cfee6112ee18219
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Thu Apr 15 19:21:22 2010 +0200
wined3d: Get rid of the width and height parameters to surface_allocate_surface().
---
dlls/wined3d/surface.c | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index 182e219..7c95530 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -797,9 +797,11 @@ static void surface_upload_data(IWineD3DSurfaceImpl *This, const struct wined3d_
* the correct texture. */
/* Context activation is done by the caller. */
static void surface_allocate_surface(IWineD3DSurfaceImpl *This, const struct wined3d_gl_info *gl_info,
- const struct wined3d_format_desc *format_desc, BOOL srgb, GLsizei width, GLsizei height)
+ const struct wined3d_format_desc *format_desc, BOOL srgb)
{
BOOL enable_client_storage = FALSE;
+ GLsizei width = This->pow2Width;
+ GLsizei height = This->pow2Height;
const BYTE *mem = NULL;
GLenum internal;
@@ -1531,7 +1533,7 @@ static void read_from_framebuffer_texture(IWineD3DSurfaceImpl *This, BOOL srgb)
if (!(This->Flags & alloc_flag))
{
- surface_allocate_surface(This, gl_info, This->resource.format_desc, srgb, This->pow2Width, This->pow2Height);
+ surface_allocate_surface(This, gl_info, This->resource.format_desc, srgb);
This->Flags |= alloc_flag;
}
@@ -1570,8 +1572,7 @@ void surface_prepare_texture(IWineD3DSurfaceImpl *surface, const struct wined3d_
else surface->Flags &= ~SFLAG_CONVERTED;
surface_bind_and_dirtify(surface, srgb);
- surface_allocate_surface(surface, gl_info, &desc, srgb,
- surface->pow2Width, surface->pow2Height);
+ surface_allocate_surface(surface, gl_info, &desc, srgb);
surface->Flags |= alloc_flag;
}
More information about the wine-cvs
mailing list