Roderick Colenbrander : wined3d: In case of GL_EXT_paletted_textures we use GL_COLOR_INDEX and don' t need a GL_RED fixup.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 756cb66e78bd402b385d2babca495609ac318960
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=756cb66e78bd402b385d2babca...

Author: Roderick Colenbrander <thunderbird2k(a)gmx.net>
Date:   Sun Dec 23 20:47:15 2007 +0100

wined3d: In case of GL_EXT_paletted_textures we use GL_COLOR_INDEX and don't need a GL_RED fixup.

---

 dlls/wined3d/surface.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index f9df55e..df89db9 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -1402,7 +1402,7 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_
                     *convert = CONVERT_PALETTED;
                 }
             }
-            else if(GL_SUPPORT(ARB_FRAGMENT_PROGRAM)) {
+            else if(!GL_SUPPORT(EXT_PALETTED_TEXTURE) && GL_SUPPORT(ARB_FRAGMENT_PROGRAM)) {
                 *format = GL_RED;
                 *internal = GL_RGBA;
                 *type = GL_UNSIGNED_BYTE;