From: Marek Olšák <maraeo@gmail.com>
Date: Tue, 8 Jan 2013 19:39:55 +0000 (+0100)
Subject: st/mesa: fix possible MSVC build error v2
X-Git-Tag: mesa-9.1-rc1~591
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2d3d0d3a5ae3829260f914462f4e63b2ff4aadbc;p=platform%2Fupstream%2Fmesa.git

st/mesa: fix possible MSVC build error v2

https://bugs.freedesktop.org/show_bug.cgi?id=59143

Using GLubyte as per Brian's suggestion.
---

diff --git a/src/mesa/state_tracker/st_cb_texture.c b/src/mesa/state_tracker/st_cb_texture.c
index 02fc675..7f07b74 100644
--- a/src/mesa/state_tracker/st_cb_texture.c
+++ b/src/mesa/state_tracker/st_cb_texture.c
@@ -759,7 +759,7 @@ fallback_copy_texsubimage(struct gl_context *ctx,
    struct st_context *st = st_context(ctx);
    struct pipe_context *pipe = st->pipe;
    struct pipe_transfer *src_trans;
-   GLvoid *texDest;
+   GLubyte *texDest;
    enum pipe_transfer_usage transfer_usage;
    void *map;
    unsigned dst_width = width;
@@ -884,7 +884,7 @@ fallback_copy_texsubimage(struct gl_context *ctx,
                         texImage->_BaseFormat, 
                         texImage->TexFormat, 
                         dstRowStride,
-                        (GLubyte **) &texDest,
+                        &texDest,
                         width, height, 1,
                         GL_RGBA, GL_FLOAT, tempSrc, /* src */
                         &unpack);