Henri Verbeet : wined3d: Pass a texture instead of a surface to upload_palette().

[Alexandre Julliard]

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

Author: Henri Verbeet 
Date:   Thu Aug 21 09:55:51 2014 +0200

wined3d: Pass a texture instead of a surface to upload_palette().

---

dlls/wined3d/arb_program_shader.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c
index 5d6214a..3d3816f 100644
--- a/dlls/wined3d/arb_program_shader.c
+++ b/dlls/wined3d/arb_program_shader.c
@@ -7278,10 +7278,10 @@ static GLuint gen_p8_shader(struct arbfp_blit_priv *priv,
 }

/* Context activation is done by the caller. */
-static void upload_palette(const struct wined3d_surface *surface, struct wined3d_context *context)
+static void upload_palette(const struct wined3d_texture *texture, struct wined3d_context *context)
 {
-    const struct wined3d_palette *palette = surface->container->swapchain ? surface->container->swapchain->palette : NULL;
-    struct wined3d_device *device = surface->resource.device;
+    const struct wined3d_palette *palette = texture->swapchain ? texture->swapchain->palette : NULL;
+    struct wined3d_device *device = texture->resource.device;
     const struct wined3d_gl_info *gl_info = context->gl_info;
     struct arbfp_blit_priv *priv = device->blit_priv;

@@ -7538,7 +7538,7 @@ err_out:
     }

if (fixup == COMPLEX_FIXUP_P8)
-        upload_palette(surface, context);
+        upload_palette(surface->container, context);

gl_info->gl_ops.gl.p_glEnable(GL_FRAGMENT_PROGRAM_ARB);
     checkGLcall("glEnable(GL_FRAGMENT_PROGRAM_ARB)");