Mesa (master): st/mesa: fix possible MSVC build error v2

Marek Olšák mareko at kemper.freedesktop.org
Tue Jan 8 20:55:02 UTC 2013


Module: Mesa
Branch: master
Commit: 2d3d0d3a5ae3829260f914462f4e63b2ff4aadbc
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=2d3d0d3a5ae3829260f914462f4e63b2ff4aadbc

Author: Marek Olšák <maraeo at gmail.com>
Date:   Tue Jan  8 20:39:55 2013 +0100

st/mesa: fix possible MSVC build error v2

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

Using GLubyte as per Brian's suggestion.

---

 src/mesa/state_tracker/st_cb_texture.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

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);




More information about the mesa-commit mailing list