From 2d3d0d3a5ae3829260f914462f4e63b2ff4aadbc Mon Sep 17 00:00:00 2001 From: Marek Olšák Date: Tue, 8 Jan 2013 20:39:55 +0100 Subject: 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 file 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 02fc675ae4c..7f07b741ee0 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); -- cgit v1.2.3