diff options
| author | Ian Romanick <ian.d.romanick@intel.com> | 2013-11-20 13:05:35 -0800 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2013-12-04 17:22:42 -0800 |
| commit | e0587fb9d06e868e0c6efe5d44c2204448d3bb12 (patch) | |
| tree | 8ea341cd905f4240666a9a9fb7598808e37e7006 | |
| parent | b092af40a52471297b29ba0c07c078f08d51cca0 (diff) | |
mesa: Minor clean-up of target_enum_to_index
Constify the gl_context parameter, and remove suffixes from enums that
have non-suffix versions.
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
| -rw-r--r-- | src/mesa/main/texobj.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c index 64689624098..e88c706b9ca 100644 --- a/src/mesa/main/texobj.c +++ b/src/mesa/main/texobj.c @@ -1173,7 +1173,7 @@ _mesa_DeleteTextures( GLsizei n, const GLuint *textures) * \return TEXTURE_x_INDEX or -1 if target is invalid */ static GLint -target_enum_to_index(struct gl_context *ctx, GLenum target) +target_enum_to_index(const struct gl_context *ctx, GLenum target) { switch (target) { case GL_TEXTURE_1D: @@ -1182,24 +1182,24 @@ target_enum_to_index(struct gl_context *ctx, GLenum target) return TEXTURE_2D_INDEX; case GL_TEXTURE_3D: return ctx->API != API_OPENGLES ? TEXTURE_3D_INDEX : -1; - case GL_TEXTURE_CUBE_MAP_ARB: + case GL_TEXTURE_CUBE_MAP: return ctx->Extensions.ARB_texture_cube_map ? TEXTURE_CUBE_INDEX : -1; - case GL_TEXTURE_RECTANGLE_NV: + case GL_TEXTURE_RECTANGLE: return _mesa_is_desktop_gl(ctx) && ctx->Extensions.NV_texture_rectangle ? TEXTURE_RECT_INDEX : -1; - case GL_TEXTURE_1D_ARRAY_EXT: + case GL_TEXTURE_1D_ARRAY: return _mesa_is_desktop_gl(ctx) && (ctx->Extensions.EXT_texture_array || ctx->Extensions.MESA_texture_array) ? TEXTURE_1D_ARRAY_INDEX : -1; - case GL_TEXTURE_2D_ARRAY_EXT: + case GL_TEXTURE_2D_ARRAY: return (_mesa_is_desktop_gl(ctx) && (ctx->Extensions.EXT_texture_array || ctx->Extensions.MESA_texture_array)) || _mesa_is_gles3(ctx) ? TEXTURE_2D_ARRAY_INDEX : -1; - case GL_TEXTURE_BUFFER_ARB: + case GL_TEXTURE_BUFFER: return ctx->API == API_OPENGL_CORE && ctx->Extensions.ARB_texture_buffer_object ? TEXTURE_BUFFER_INDEX : -1; |