Henri Verbeet : wined3d: Use the proper texture target in ffp_blit_p8_upload_palette().

[Alexandre Julliard]

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

Author: Henri Verbeet 
Date:   Tue Jul 17 11:40:37 2012 +0200

wined3d: Use the proper texture target in ffp_blit_p8_upload_palette().

---

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

diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index c0b27ba..13c88f9 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -6333,12 +6333,18 @@ static void ffp_blit_p8_upload_palette(const struct wined3d_surface *surface, co
 {
     BYTE table[256][4];
     BOOL colorkey_active = (surface->CKeyFlags & WINEDDSD_CKSRCBLT) ? TRUE : FALSE;
+    GLenum target;
+
+    if (surface->container.type == WINED3D_CONTAINER_TEXTURE)
+        target = surface->container.u.texture->target;
+    else
+        target = surface->texture_target;

d3dfmt_p8_init_palette(surface, table, colorkey_active);

TRACE("Using GL_EXT_PALETTED_TEXTURE for 8-bit paletted texture support\n");
     ENTER_GL();
-    GL_EXTCALL(glColorTableEXT(surface->texture_target, GL_RGBA, 256, GL_RGBA, GL_UNSIGNED_BYTE, table));
+    GL_EXTCALL(glColorTableEXT(target, GL_RGBA, 256, GL_RGBA, GL_UNSIGNED_BYTE, table));
     LEAVE_GL();
 }