Stefan Dösinger : wined3d: Correct the srgb reading check.
Alexandre Julliard
julliard at winehq.org
Tue Feb 5 06:35:06 CST 2008
Module: wine
Branch: master
Commit: 9d9a640127585c63053d3d0a3914c2897e1dd517
URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d9a640127585c63053d3d0a3914c2897e1dd517
Author: Stefan Dösinger <stefan at codeweavers.com>
Date: Mon Feb 4 00:23:46 2008 +0100
wined3d: Correct the srgb reading check.
---
dlls/wined3d/directx.c | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index afd012a..7312f9c 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -1918,7 +1918,11 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt
}
/* Check for supported sRGB formats (Texture loading and framebuffer) */
- if (GL_SUPPORT(EXT_TEXTURE_SRGB) && (Usage & WINED3DUSAGE_QUERY_SRGBREAD)) {
+ if (Usage & WINED3DUSAGE_QUERY_SRGBREAD) {
+ if(!GL_SUPPORT(EXT_TEXTURE_SRGB)) {
+ TRACE_(d3d_caps)("[FAILED] GL_EXT_texture_sRGB not supported\n");
+ }
+
switch (CheckFormat) {
case WINED3DFMT_A8R8G8B8:
case WINED3DFMT_X8R8G8B8:
@@ -1931,7 +1935,7 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt
case WINED3DFMT_DXT4:
case WINED3DFMT_DXT5:
TRACE_(d3d_caps)("[OK]\n");
- return WINED3D_OK;
+ break; /* Continue with checking other flags */
default:
TRACE_(d3d_caps)("[FAILED] Gamma texture format %s not supported.\n", debug_d3dformat(CheckFormat));
More information about the wine-cvs
mailing list