fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-03 05:00:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

mesa: Use common _mesa_tex_target_to_index in tex param code

Browse source 
TEXTURE_BUFFER_INDEX has to be specially called out because it is not
allowed in any of the glTexParameter or glGetTexParameter functions.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
This commit is contained in:
Ian Romanick 2013-11-23 12:16:57 -08:00
parent 35e7027dab
commit a722454dac
1 changed files with 9 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
src/mesa/main/texparam.c
View file

@ -126,6 +126,7 @@ static struct gl_texture_object *
get_texobj(struct gl_context *ctx, GLenum target, GLboolean get)
{
struct gl_texture_unit *texUnit;
int targetIndex;
if (ctx->Texture.CurrentUnit >= ctx->Const.MaxCombinedTextureImageUnits) {
_mesa_error(ctx, GL_INVALID_OPERATION,
@ -135,66 +136,15 @@ get_texobj(struct gl_context *ctx, GLenum target, GLboolean get)
texUnit = _mesa_get_current_tex_unit(ctx);
switch (target) {
case GL_TEXTURE_1D:
if (_mesa_is_desktop_gl(ctx))
return texUnit->CurrentTex[TEXTURE_1D_INDEX];
break;
case GL_TEXTURE_2D:
return texUnit->CurrentTex[TEXTURE_2D_INDEX];
case GL_TEXTURE_3D:
if (ctx->API != API_OPENGLES)
return texUnit->CurrentTex[TEXTURE_3D_INDEX];
break;
case GL_TEXTURE_CUBE_MAP:
if (ctx->Extensions.ARB_texture_cube_map) {
return texUnit->CurrentTex[TEXTURE_CUBE_INDEX];
}
break;
case GL_TEXTURE_RECTANGLE_NV:
if (_mesa_is_desktop_gl(ctx)
&& ctx->Extensions.NV_texture_rectangle) {
return texUnit->CurrentTex[TEXTURE_RECT_INDEX];
}
break;
case GL_TEXTURE_1D_ARRAY_EXT:
if (_mesa_is_desktop_gl(ctx) && ctx->Extensions.EXT_texture_array) {
return texUnit->CurrentTex[TEXTURE_1D_ARRAY_INDEX];
}
break;
case GL_TEXTURE_2D_ARRAY_EXT:
if ((_mesa_is_desktop_gl(ctx) || _mesa_is_gles3(ctx))
&& ctx->Extensions.EXT_texture_array) {
return texUnit->CurrentTex[TEXTURE_2D_ARRAY_INDEX];
}
break;
case GL_TEXTURE_EXTERNAL_OES:
if (_mesa_is_gles(ctx) && ctx->Extensions.OES_EGL_image_external) {
return texUnit->CurrentTex[TEXTURE_EXTERNAL_INDEX];
}
break;
case GL_TEXTURE_CUBE_MAP_ARRAY:
if (ctx->Extensions.ARB_texture_cube_map_array) {
return texUnit->CurrentTex[TEXTURE_CUBE_ARRAY_INDEX];
}
break;
case GL_TEXTURE_2D_MULTISAMPLE:
if (ctx->Extensions.ARB_texture_multisample) {
return texUnit->CurrentTex[TEXTURE_2D_MULTISAMPLE_INDEX];
}
break;
case GL_TEXTURE_2D_MULTISAMPLE_ARRAY:
if (ctx->Extensions.ARB_texture_multisample) {
return texUnit->CurrentTex[TEXTURE_2D_MULTISAMPLE_ARRAY_INDEX];
}
break;
default:
;
}
_mesa_error(ctx, GL_INVALID_ENUM,
targetIndex = _mesa_tex_target_to_index(ctx, target);
if (targetIndex < 0 || targetIndex == TEXTURE_BUFFER_INDEX) {
_mesa_error(ctx, GL_INVALID_ENUM,
"gl%sTexParameter(target)", get ? "Get" : "");
return NULL;
return NULL;
}
assert(targetIndex < NUM_TEXTURE_TARGETS);
return texUnit->CurrentTex[targetIndex];
}