Module: wine Branch: master Commit: a3657c164d251d1d3ab219b6b9d81a187765ba19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3657c164d251d1d3ab219b6b9...
Author: Henri Verbeet hverbeet@codeweavers.com Date: Fri Mar 13 10:44:17 2009 +0100
wined3d: Remove some redundant fields from struct glDescriptor.
---
dlls/wined3d/device.c | 27 +++++++++++---------------- dlls/wined3d/surface.c | 36 ++++++++++++++---------------------- include/wine/wined3d.idl | 3 --- 3 files changed, 25 insertions(+), 41 deletions(-)
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4cefa18..26759cb 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6028,6 +6028,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_UpdateSurface(IWineD3DDevice *iface, int offset = 0; int rowoffset = 0; /* how many bytes to add onto the end of a row to wraparound to the beginning of the next */ glDescriptor *glDescription = NULL; + const struct GlPixelFormatDesc *dst_format_desc; GLenum dummy; int sampler; int bpp; @@ -6091,6 +6092,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_UpdateSurface(IWineD3DDevice *iface,
IWineD3DSurface_GetGlDesc(pDestinationSurface, &glDescription);
+ dst_format_desc = ((IWineD3DSurfaceImpl *)pDestinationSurface)->resource.format_desc; + /* this needs to be done in lines if the sourceRect != the sourceWidth */ srcWidth = pSourceRect ? pSourceRect->right - pSourceRect->left : srcSurfaceWidth; srcHeight = pSourceRect ? pSourceRect->bottom - pSourceRect->top : srcSurfaceHeight; @@ -6112,8 +6115,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_UpdateSurface(IWineD3DDevice *iface, offset += pSourceRect->top * srcSurfaceWidth * pSrcSurface->bytesPerPixel; } TRACE("(%p) glTexSubImage2D, level %d, left %d, top %d, width %d, height %d, fmt %#x, type %#x, memory %p+%#x\n", - This, glDescription->level, destLeft, destTop, srcWidth, srcHeight, glDescription->glFormat, - glDescription->glType, IWineD3DSurface_GetData(pSourceSurface), offset); + This, glDescription->level, destLeft, destTop, srcWidth, srcHeight, dst_format_desc->glFormat, + dst_format_desc->glType, IWineD3DSurface_GetData(pSourceSurface), offset);
/* Sanity check */ if (IWineD3DSurface_GetData(pSourceSurface) == NULL) { @@ -6132,18 +6135,10 @@ static HRESULT WINAPI IWineD3DDeviceImpl_UpdateSurface(IWineD3DDevice *iface, /* hopefully using pointer addition will be quicker than using a point + j * rowoffset */ const unsigned char* data =((const unsigned char *)IWineD3DSurface_GetData(pSourceSurface)) + offset;
- for(j = destTop ; j < (srcHeight + destTop) ; j++){ - - glTexSubImage2D(glDescription->target - ,glDescription->level - ,destLeft - ,j - ,srcWidth - ,1 - ,glDescription->glFormat - ,glDescription->glType - ,data /* could be quicker using */ - ); + for (j = destTop; j < (srcHeight + destTop); ++j) + { + glTexSubImage2D(glDescription->target, glDescription->level, destLeft, j, + srcWidth, 1, dst_format_desc->glFormat, dst_format_desc->glType,data); data += rowoffset; }
@@ -6163,7 +6158,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_UpdateSurface(IWineD3DDevice *iface, FIXME("Updating mixed format compressed texture is not curretly support\n"); } else { GL_EXTCALL(glCompressedTexImage2DARB(glDescription->target, glDescription->level, - glDescription->glFormatInternal, srcWidth, srcHeight, 0, destSize, data)); + dst_format_desc->glInternal, srcWidth, srcHeight, 0, destSize, data)); } } else { FIXME("Attempting to update a DXT compressed texture without hardware support\n"); @@ -6172,7 +6167,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_UpdateSurface(IWineD3DDevice *iface,
} else { glTexSubImage2D(glDescription->target, glDescription->level, destLeft, destTop, - srcWidth, srcHeight, glDescription->glFormat, glDescription->glType, data); + srcWidth, srcHeight, dst_format_desc->glFormat, dst_format_desc->glType, data); } } checkGLcall("glTexSubImage2D"); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 7ccc3e0..8f79da0 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -138,12 +138,16 @@ static BOOL primary_render_target_is_p8(IWineD3DDeviceImpl *device) /* This call just downloads data, the caller is responsible for activating the * right context and binding the correct texture. */ static void surface_download_data(IWineD3DSurfaceImpl *This) { + const struct GlPixelFormatDesc *format_desc; + /* Only support read back of converted P8 surfaces */ if(This->Flags & SFLAG_CONVERTED && (This->resource.format != WINED3DFMT_P8)) { FIXME("Read back converted textures unsupported, format=%s\n", debug_d3dformat(This->resource.format)); return; }
+ format_desc = This->resource.format_desc; + ENTER_GL();
if (This->resource.format == WINED3DFMT_DXT1 || @@ -153,8 +157,9 @@ static void surface_download_data(IWineD3DSurfaceImpl *This) { if (!GL_SUPPORT(EXT_TEXTURE_COMPRESSION_S3TC)) { /* We can assume this as the texture would not have been created otherwise */ FIXME("(%p) : Attempting to lock a compressed texture when texture compression isn't supported by opengl\n", This); } else { - TRACE("(%p) : Calling glGetCompressedTexImageARB level %d, format %#x, type %#x, data %p\n", This, This->glDescription.level, - This->glDescription.glFormat, This->glDescription.glType, This->resource.allocatedMemory); + TRACE("(%p) : Calling glGetCompressedTexImageARB level %d, format %#x, type %#x, data %p\n", + This, This->glDescription.level, format_desc->glFormat, format_desc->glType, + This->resource.allocatedMemory);
if(This->Flags & SFLAG_PBO) { GL_EXTCALL(glBindBufferARB(GL_PIXEL_PACK_BUFFER_ARB, This->pbo)); @@ -171,8 +176,8 @@ static void surface_download_data(IWineD3DSurfaceImpl *This) { LEAVE_GL(); } else { void *mem; - GLenum format = This->glDescription.glFormat; - GLenum type = This->glDescription.glType; + GLenum format = format_desc->glFormat; + GLenum type = format_desc->glType; int src_pitch = 0; int dst_pitch = 0;
@@ -829,8 +834,8 @@ static void read_from_framebuffer(IWineD3DSurfaceImpl *This, CONST RECT *rect, v
default: mem = dest; - fmt = This->glDescription.glFormat; - type = This->glDescription.glType; + fmt = This->resource.format_desc->glFormat; + type = This->resource.format_desc->glType; bpp = This->bytesPerPixel; }
@@ -2557,20 +2562,13 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_SaveSnapshot(IWineD3DSurface *iface, c static HRESULT WINAPI IWineD3DSurfaceImpl_SetFormat(IWineD3DSurface *iface, WINED3DFORMAT format) { IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; HRESULT hr; - const struct GlPixelFormatDesc *glDesc; - getFormatDescEntry(format, &GLINFO_LOCATION, &glDesc);
TRACE("(%p) : Calling base function first\n", This); hr = IWineD3DBaseSurfaceImpl_SetFormat(iface, format); if(SUCCEEDED(hr)) { - /* Setup some glformat defaults */ - This->glDescription.glFormat = glDesc->glFormat; - This->glDescription.glFormatInternal = glDesc->glInternal; - This->glDescription.glType = glDesc->glType; - This->Flags &= ~(SFLAG_ALLOCATED | SFLAG_SRGBALLOCATED); - TRACE("(%p) : glFormat %d, glFotmatInternal %d, glType %d\n", This, - This->glDescription.glFormat, This->glDescription.glFormatInternal, This->glDescription.glType); + TRACE("(%p) : glFormat %d, glFormatInternal %d, glType %d\n", This, This->resource.format_desc->glFormat, + This->resource.format_desc->glInternal, This->resource.format_desc->glType); } return hr; } @@ -3837,14 +3835,8 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_RealizePalette(IWineD3DSurface *iface) static HRESULT WINAPI IWineD3DSurfaceImpl_PrivateSetup(IWineD3DSurface *iface) { /** Check against the maximum texture sizes supported by the video card **/ IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *) iface; - const struct GlPixelFormatDesc *glDesc = This->resource.format_desc; unsigned int pow2Width, pow2Height;
- /* Setup some glformat defaults */ - This->glDescription.glFormat = glDesc->glFormat; - This->glDescription.glFormatInternal = glDesc->glInternal; - This->glDescription.glType = glDesc->glType; - This->glDescription.textureName = 0; This->glDescription.target = GL_TEXTURE_2D;
@@ -4126,7 +4118,7 @@ void surface_load_ds_location(IWineD3DSurface *iface, DWORD location) { glBindTexture(bind_target, device->depth_blt_texture); glCopyTexImage2D(bind_target, This->glDescription.level, - This->glDescription.glFormatInternal, + This->resource.format_desc->glInternal, 0, 0, This->currentDesc.Width, diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index b2ecfa0..5d502f1 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -1911,9 +1911,6 @@ typedef struct glDescriptor UINT textureName, srgbTextureName; int level; int /*GLenum*/ target; - int /*GLenum*/ glFormat; - int /*GLenum*/ glFormatInternal; - int /*GLenum*/ glType; } glDescriptor;
typedef struct WineDirect3DStridedData