diff options
| author | marha <marha@users.sourceforge.net> | 2013-01-22 14:07:34 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-01-22 14:07:34 +0100 |
| commit | 470f7ca9f0be348faf2f03fc16811844c5eeffce (patch) | |
| tree | 3071ab9b9fbabc772ee68c86fe587f260bde26c6 /mesalib/src/mesa/main/glformats.c | |
| parent | 4fc6b34d1c14cc61f553ca59264d0909656933f3 (diff) | |
| download | vcxsrv-470f7ca9f0be348faf2f03fc16811844c5eeffce.tar.gz vcxsrv-470f7ca9f0be348faf2f03fc16811844c5eeffce.tar.bz2 vcxsrv-470f7ca9f0be348faf2f03fc16811844c5eeffce.zip | |
fontconfig libfontenc mesa mkfontscale pixman xserver xkeyboard-config
fontconfig: 000ca9ccb03013a5b151f0d21148ab0ca4c2f2de
libfontenc: f5d1208172e965fdd7fae8927bd3e29b3cc3a975
mesa: 148fc6d53716f39971a453792570c2b8c207efb6
mkfontscale: 547517571e695728278a264eedbac47b6e1f43bc
pixman: 2c6577476e5b18e17904ae8af244a39c352e2e33
xserver: 70b127c9f1c53bdb42f078265e67f76b464deae2
xkeyboard-config: 6b35b1b43d2fdff30f530d7cf65fffd6c3504690
Diffstat (limited to 'mesalib/src/mesa/main/glformats.c')
| -rw-r--r-- | mesalib/src/mesa/main/glformats.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/mesalib/src/mesa/main/glformats.c b/mesalib/src/mesa/main/glformats.c index 7969f77a4..e4f784179 100644 --- a/mesalib/src/mesa/main/glformats.c +++ b/mesalib/src/mesa/main/glformats.c @@ -1697,8 +1697,7 @@ _mesa_es_error_check_format_and_type(GLenum format, GLenum type, */ GLenum _mesa_es3_error_check_format_and_type(GLenum format, GLenum type, - GLenum internalFormat, - unsigned dimensions) + GLenum internalFormat) { GLboolean type_valid = GL_TRUE; @@ -2068,17 +2067,16 @@ _mesa_es3_error_check_format_and_type(GLenum format, GLenum type, break; case GL_DEPTH_COMPONENT: - if (dimensions != 2) { - return GL_INVALID_OPERATION; - } switch (type) { case GL_UNSIGNED_SHORT: - if (internalFormat != GL_DEPTH_COMPONENT16) + if (internalFormat != GL_DEPTH_COMPONENT + && internalFormat != GL_DEPTH_COMPONENT16) return GL_INVALID_OPERATION; break; case GL_UNSIGNED_INT: switch (internalFormat) { + case GL_DEPTH_COMPONENT: case GL_DEPTH_COMPONENT16: case GL_DEPTH_COMPONENT24: break; @@ -2098,12 +2096,10 @@ _mesa_es3_error_check_format_and_type(GLenum format, GLenum type, break; case GL_DEPTH_STENCIL: - if (dimensions != 2) { - return GL_INVALID_OPERATION; - } switch (type) { case GL_UNSIGNED_INT_24_8: - if (internalFormat != GL_DEPTH24_STENCIL8) + if (internalFormat != GL_DEPTH_STENCIL + && internalFormat != GL_DEPTH24_STENCIL8) return GL_INVALID_OPERATION; break; |