diff options
| author | Marek Olšák <[email protected]> | 2013-01-08 20:39:55 +0100 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2013-01-08 21:53:13 +0100 |
| commit | 2d3d0d3a5ae3829260f914462f4e63b2ff4aadbc (patch) | |
| tree | c0c790e3f7e5b2cd7a35e258491e13201fcb571e /src/mesa/state_tracker | |
| parent | c35abcd1b0d0e0059c60781bd21558872020553d (diff) | |
st/mesa: fix possible MSVC build error v2
https://bugs.freedesktop.org/show_bug.cgi?id=59143
Using GLubyte as per Brian's suggestion.
Diffstat (limited to 'src/mesa/state_tracker')
| -rw-r--r-- | 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 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); |