ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
Henri Verbeet 2010-04-15 19:21:23 +02:00 committed by Alexandre Julliard
parent 212bfab2df
commit bc2850a587
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dlls/wined3d/surface.c
View File

@ -720,8 +720,10 @@ static void surface_download_data(IWineD3DSurfaceImpl *This, const struct wined3
* correct texture. */ * correct texture. */
/* Context activation is done by the caller. */ /* Context activation is done by the caller. */
static void surface_upload_data(IWineD3DSurfaceImpl *This, const struct wined3d_gl_info *gl_info, 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; GLenum internal;
if (srgb) if (srgb)
@ -4517,10 +4519,7 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadLocation(IWineD3DSurface *iface, D
LEAVE_GL(); LEAVE_GL();
if (mem || (This->Flags & SFLAG_PBO)) if (mem || (This->Flags & SFLAG_PBO))
{ surface_upload_data(This, gl_info, &desc, srgb, mem);
surface_upload_data(This, gl_info, &desc, srgb,
This->currentDesc.Width, This->currentDesc.Height, mem);
}
/* Restore the default pitch */ /* Restore the default pitch */
ENTER_GL(); ENTER_GL();