Henri Verbeet : wined3d: Check the correct extensions in d3dfmt_get_conv().
Alexandre Julliard
julliard at winehq.org
Wed Jun 10 10:16:58 CDT 2009
Module: wine
Branch: master
Commit: a25e63c62d3232563d6537149d40edf413ec10cb
URL: http://source.winehq.org/git/wine.git/?a=commit;h=a25e63c62d3232563d6537149d40edf413ec10cb
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Wed Jun 10 09:44:04 2009 +0200
wined3d: Check the correct extensions in d3dfmt_get_conv().
According to Stefan these are either typos or leftovers from using GL_HILO8_NV.
---
dlls/wined3d/surface.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index 11e467b..a20ecd2 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -1725,7 +1725,7 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_
break;
case WINED3DFMT_R8G8_SNORM:
- if(GL_SUPPORT(NV_TEXTURE_SHADER3)) break;
+ if (GL_SUPPORT(NV_TEXTURE_SHADER)) break;
*convert = CONVERT_V8U8;
*format = GL_BGR;
*type = GL_UNSIGNED_BYTE;
@@ -1762,7 +1762,7 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_
break;
case WINED3DFMT_R8G8B8A8_SNORM:
- if(GL_SUPPORT(NV_TEXTURE_SHADER3)) break;
+ if (GL_SUPPORT(NV_TEXTURE_SHADER)) break;
*convert = CONVERT_Q8W8V8U8;
*format = GL_BGRA;
*type = GL_UNSIGNED_BYTE;
@@ -1770,7 +1770,7 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_
break;
case WINED3DFMT_R16G16_SNORM:
- if(GL_SUPPORT(NV_TEXTURE_SHADER3)) break;
+ if (GL_SUPPORT(NV_TEXTURE_SHADER)) break;
*convert = CONVERT_V16U16;
*format = GL_BGR;
*type = GL_UNSIGNED_SHORT;
More information about the wine-cvs
mailing list