Henri Verbeet : wined3d: Don' t respecify compressed textures in surface_upload_data().
Module: wine Branch: master Commit: b7812932bc74cf4411bfdbb2277fb0aaf8e24b04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7812932bc74cf4411bfdbb227... Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 3 08:06:52 2009 +0200 wined3d: Don't respecify compressed textures in surface_upload_data(). Passing NULL to glCompressedTexImage2DARB() doesn't work particularly well when both client storage and PBOs are enabled. Also, two years is long enough to give driver developers a chance to fix the bug this was supposed to work around. --- dlls/wined3d/surface.c | 113 ++++++++++++++++++------------------------------ 1 files changed, 42 insertions(+), 71 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index e74c90e..b375df4 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -500,66 +500,48 @@ static void surface_download_data(IWineD3DSurfaceImpl *This) { static void surface_upload_data(IWineD3DSurfaceImpl *This, GLenum internal, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *data) { const struct GlPixelFormatDesc *format_desc = This->resource.format_desc; - if (format_desc->heightscale != 1.0f && format_desc->heightscale != 0.0f) height *= format_desc->heightscale; - - if (format_desc->Flags & WINED3DFMT_FLAG_COMPRESSED) - { - /* glCompressedTexSubImage2D() for uploading and glTexImage2D() for - * allocating does not work well on some drivers (r200 dri, MacOS ATI - * driver). glCompressedTexImage2D() does not accept NULL pointers. So - * for compressed textures surface_allocate_surface() does nothing, - * and this function uses glCompressedTexImage2D() instead of - * glCompressedTexSubImage2D(). */ - TRACE("(%p) : Calling glCompressedTexImage2DARB w %u, h %u, data %p.\n", This, width, height, data); + TRACE("This %p, internal %#x, width %d, height %d, format %#x, type %#x, data %p.\n", + This, internal, width, height, format, type, data); + TRACE("target %#x, level %u, resource size %u.\n", + This->texture_target, This->texture_level, This->resource.size); - ENTER_GL(); + if (format_desc->heightscale != 1.0f && format_desc->heightscale != 0.0f) height *= format_desc->heightscale; - if (This->Flags & SFLAG_PBO) - { - GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, This->pbo)); - checkGLcall("glBindBufferARB"); + ENTER_GL(); - TRACE("(%p) pbo: %#x, data: %p.\n", This, This->pbo, data); + if (This->Flags & SFLAG_PBO) + { + GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, This->pbo)); + checkGLcall("glBindBufferARB"); - GL_EXTCALL(glCompressedTexImage2DARB(This->texture_target, This->texture_level, - internal, width, height, 0 /* border */, This->resource.size, NULL)); - checkGLcall("glCompressedTexImage2DARB"); + TRACE("(%p) pbo: %#x, data: %p.\n", This, This->pbo, data); + data = NULL; + } - GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, 0)); - checkGLcall("glBindBufferARB"); - } - else - { - GL_EXTCALL(glCompressedTexImage2DARB(This->texture_target, This->texture_level, - internal, width, height, 0 /* border */, This->resource.size, data)); - checkGLcall("glCompressedTexSubImage2D"); - } + if (format_desc->Flags & WINED3DFMT_FLAG_COMPRESSED) + { + TRACE("Calling glCompressedTexSubImage2DARB.\n"); - LEAVE_GL(); + GL_EXTCALL(glCompressedTexSubImage2DARB(This->texture_target, This->texture_level, + 0, 0, width, height, internal, This->resource.size, data)); + checkGLcall("glCompressedTexSubImage2DARB"); } else { - TRACE("(%p) : Calling glTexSubImage2D w %d, h %d, data, %p\n", This, width, height, data); - ENTER_GL(); - - if(This->Flags & SFLAG_PBO) { - GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, This->pbo)); - checkGLcall("glBindBufferARB"); - TRACE("(%p) pbo: %#x, data: %p\n", This, This->pbo, data); + TRACE("Calling glTexSubImage2D.\n"); - glTexSubImage2D(This->texture_target, This->texture_level, 0, 0, width, height, format, type, NULL); - checkGLcall("glTexSubImage2D"); - - GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, 0)); - checkGLcall("glBindBufferARB"); - } - else { - glTexSubImage2D(This->texture_target, This->texture_level, 0, 0, width, height, format, type, data); - checkGLcall("glTexSubImage2D"); - } + glTexSubImage2D(This->texture_target, This->texture_level, + 0, 0, width, height, format, type, data); + checkGLcall("glTexSubImage2D"); + } - LEAVE_GL(); + if (This->Flags & SFLAG_PBO) + { + GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, 0)); + checkGLcall("glBindBufferARB"); } + + LEAVE_GL(); } /* This call just allocates the texture, the caller is responsible for binding @@ -576,27 +558,6 @@ static void surface_allocate_surface(IWineD3DSurfaceImpl *This, GLenum internal, This, This->texture_target, This->texture_level, debug_d3dformat(format_desc->format), internal, width, height, format, type); - if (format_desc->Flags & WINED3DFMT_FLAG_COMPRESSED) - { - /* glCompressedTexImage2D does not accept NULL pointers, so we cannot allocate a compressed texture without uploading data */ - TRACE("Not allocating compressed surfaces, surface_upload_data will specify them\n"); - - /* We have to point GL to the client storage memory here, because upload_data might use a PBO. This means a double upload - * once, unfortunately - */ - if(GL_SUPPORT(APPLE_CLIENT_STORAGE)) { - /* Neither NONPOW2, DIBSECTION nor OVERSIZE flags can be set on compressed textures */ - This->Flags |= SFLAG_CLIENT; - mem = (BYTE *)(((ULONG_PTR) This->resource.heapMemory + (RESOURCE_ALIGNMENT - 1)) & ~(RESOURCE_ALIGNMENT - 1)); - ENTER_GL(); - GL_EXTCALL(glCompressedTexImage2DARB(This->texture_target, This->texture_level, internal, - width, height, 0 /* border */, This->resource.size, mem)); - LEAVE_GL(); - } - - return; - } - ENTER_GL(); if(GL_SUPPORT(APPLE_CLIENT_STORAGE)) { @@ -621,8 +582,18 @@ static void surface_allocate_surface(IWineD3DSurfaceImpl *This, GLenum internal, mem = (BYTE *)(((ULONG_PTR) This->resource.heapMemory + (RESOURCE_ALIGNMENT - 1)) & ~(RESOURCE_ALIGNMENT - 1)); } } - glTexImage2D(This->texture_target, This->texture_level, internal, width, height, 0, format, type, mem); - checkGLcall("glTexImage2D"); + + if (format_desc->Flags & WINED3DFMT_FLAG_COMPRESSED && mem) + { + GL_EXTCALL(glCompressedTexImage2DARB(This->texture_target, This->texture_level, + internal, width, height, 0, This->resource.size, mem)); + } + else + { + glTexImage2D(This->texture_target, This->texture_level, + internal, width, height, 0, format, type, mem); + checkGLcall("glTexImage2D"); + } if(enable_client_storage) { glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_TRUE);
participants (1)
-
Alexandre Julliard