Commit 7f6ab3c0 authored by Henri Verbeet's avatar Henri Verbeet Committed by Alexandre Julliard

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

parent 65797d7f
......@@ -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 */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment