diff options
author | marha <marha@users.sourceforge.net> | 2011-04-06 21:03:59 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2011-04-06 21:03:59 +0000 |
commit | e2b908c356746281aba48128da7dc15a28f5a773 (patch) | |
tree | 5f0a12dfa33c059d8fe09d9a5a792792f44189a6 /mesalib/src/mesa/state_tracker/st_cb_texture.c | |
parent | 1fc1b7f67928082b9e922463be25c232d9bcba6a (diff) | |
parent | 704e01fc69ebf6302aa1876906805147248abdaa (diff) | |
download | vcxsrv-e2b908c356746281aba48128da7dc15a28f5a773.tar.gz vcxsrv-e2b908c356746281aba48128da7dc15a28f5a773.tar.bz2 vcxsrv-e2b908c356746281aba48128da7dc15a28f5a773.zip |
svn merge ^/branches/released .
Diffstat (limited to 'mesalib/src/mesa/state_tracker/st_cb_texture.c')
-rw-r--r-- | mesalib/src/mesa/state_tracker/st_cb_texture.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mesalib/src/mesa/state_tracker/st_cb_texture.c b/mesalib/src/mesa/state_tracker/st_cb_texture.c index 1b824c0de..ab0db46df 100644 --- a/mesalib/src/mesa/state_tracker/st_cb_texture.c +++ b/mesalib/src/mesa/state_tracker/st_cb_texture.c @@ -87,6 +87,8 @@ gl_target_to_pipe(GLenum target) return PIPE_TEXTURE_1D_ARRAY;
case GL_TEXTURE_2D_ARRAY_EXT:
return PIPE_TEXTURE_2D_ARRAY;
+ case GL_TEXTURE_BUFFER:
+ return PIPE_BUFFER;
default:
assert(0);
return 0;
@@ -245,6 +247,7 @@ get_texture_dims(GLenum target) switch (target) {
case GL_TEXTURE_1D:
case GL_TEXTURE_1D_ARRAY_EXT:
+ case GL_TEXTURE_BUFFER:
return 1;
case GL_TEXTURE_2D:
case GL_TEXTURE_CUBE_MAP_ARB:
|