diff options
| author | marha <marha@users.sourceforge.net> | 2012-09-18 08:21:05 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-09-18 08:21:05 +0200 |
| commit | d7ddd6ead83965a10d450a580a9b6042c7b86f38 (patch) | |
| tree | 9ca8c23b6aa54418990c4d851e8da97c577636a7 /mesalib/src/mesa/main/texobj.h | |
| parent | c72f683c50e774b21967f0121245a286539fa555 (diff) | |
| parent | 52213f2cd11c6cc7210cea6896ed464fddfe3fec (diff) | |
| download | vcxsrv-d7ddd6ead83965a10d450a580a9b6042c7b86f38.tar.gz vcxsrv-d7ddd6ead83965a10d450a580a9b6042c7b86f38.tar.bz2 vcxsrv-d7ddd6ead83965a10d450a580a9b6042c7b86f38.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/mesa/main/texobj.h')
| -rw-r--r-- | mesalib/src/mesa/main/texobj.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/mesalib/src/mesa/main/texobj.h b/mesalib/src/mesa/main/texobj.h index a6f1d3a14..f22c58cad 100644 --- a/mesalib/src/mesa/main/texobj.h +++ b/mesalib/src/mesa/main/texobj.h @@ -85,7 +85,13 @@ _mesa_reference_texobj(struct gl_texture_object **ptr, static inline GLuint _mesa_num_tex_faces(GLenum target) { - return target == GL_TEXTURE_CUBE_MAP ? 6 : 1; + switch (target) { + case GL_TEXTURE_CUBE_MAP: + case GL_PROXY_TEXTURE_CUBE_MAP: + return 6; + default: + return 1; + } } |