diff options
| author | marha <marha@users.sourceforge.net> | 2013-01-31 08:14:38 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-01-31 08:14:38 +0100 |
| commit | 3dc034dda1a451ed7dc48cfb10caba11e66b4132 (patch) | |
| tree | ac2f7522e5b3287afdb5dcd5af6d9c6bb9a3d079 /mesalib/src/mesa/main/glformats.c | |
| parent | 4e7e0bd9194a033f05179fb64126c56fc6f072b5 (diff) | |
| parent | 436f8246cd5a377596f6e42e6562da186ef8df48 (diff) | |
| download | vcxsrv-3dc034dda1a451ed7dc48cfb10caba11e66b4132.tar.gz vcxsrv-3dc034dda1a451ed7dc48cfb10caba11e66b4132.tar.bz2 vcxsrv-3dc034dda1a451ed7dc48cfb10caba11e66b4132.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
libxtrans mesa pixman xkeyboard-config git update 31 jan 2013
Diffstat (limited to 'mesalib/src/mesa/main/glformats.c')
| -rw-r--r-- | mesalib/src/mesa/main/glformats.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/mesalib/src/mesa/main/glformats.c b/mesalib/src/mesa/main/glformats.c index 6160d8ecd..8728540cf 100644 --- a/mesalib/src/mesa/main/glformats.c +++ b/mesalib/src/mesa/main/glformats.c @@ -1485,18 +1485,8 @@ _mesa_error_check_format_and_type(const struct gl_context *ctx, else if (ctx->Extensions.ARB_depth_buffer_float && type == GL_FLOAT_32_UNSIGNED_INT_24_8_REV) return GL_NO_ERROR; - switch (type) { - case GL_BYTE: - case GL_UNSIGNED_BYTE: - case GL_SHORT: - case GL_UNSIGNED_SHORT: - case GL_INT: - case GL_UNSIGNED_INT: - case GL_FLOAT: - return GL_INVALID_OPERATION; - default: + else return GL_INVALID_ENUM; - } case GL_DUDV_ATI: case GL_DU8DV8_ATI: |