fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 21:50:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

mesa: move lookup_texture_ext_dsa up in teximage.c

Browse source 
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
This commit is contained in:
Pierre-Eric Pelloux-Prayer 2019-07-02 11:33:36 +02:00 • committed by Marek Olšák
parent 9dd1f7cec0
commit f8ad95c45f
1 changed files with 60 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

123
src/mesa/main/teximage.c
View file

@ -2873,6 +2873,66 @@ strip_texture_border(GLenum target,
}
}
static struct gl_texture_object *
lookup_texture_ext_dsa(struct gl_context *ctx, GLenum target, GLuint texture,
const char *caller)
{
GLenum boundTarget;
switch (target) {
case GL_TEXTURE_CUBE_MAP_POSITIVE_X:
case GL_TEXTURE_CUBE_MAP_NEGATIVE_X:
case GL_TEXTURE_CUBE_MAP_POSITIVE_Y:
case GL_TEXTURE_CUBE_MAP_NEGATIVE_Y:
case GL_TEXTURE_CUBE_MAP_POSITIVE_Z:
case GL_TEXTURE_CUBE_MAP_NEGATIVE_Z:
boundTarget = GL_TEXTURE_CUBE_MAP;
break;
default:
boundTarget = target;
break;
}
int targetIndex = _mesa_tex_target_to_index(ctx, boundTarget);
if (targetIndex < 0) {
_mesa_error(ctx, GL_INVALID_ENUM, "%s(target = %s)", caller,
_mesa_enum_to_string(target));
return NULL;
}
assert(targetIndex < NUM_TEXTURE_TARGETS);
struct gl_texture_object *texObj;
if (texture == 0) {
/* Use a default texture object */
texObj = ctx->Shared->DefaultTex[targetIndex];
assert(texObj);
} else {
texObj = _mesa_lookup_texture(ctx, texture);
if (!texObj && ctx->API == API_OPENGL_CORE) {
_mesa_error(ctx, GL_INVALID_OPERATION, "%s(non-gen name)", caller);
return NULL;
}
if (!texObj) {
texObj = ctx->Driver.NewTextureObject(ctx, texture, boundTarget);
if (!texObj) {
_mesa_error(ctx, GL_OUT_OF_MEMORY, "%s", caller);
return NULL;
}
/* insert into hash table */
_mesa_HashInsert(ctx->Shared->TexObjects, texObj->Name, texObj);
}
if (texObj->Target != boundTarget) {
_mesa_error(ctx, GL_INVALID_OPERATION, "%s(%s != %s)",
caller, _mesa_enum_to_string(texObj->Target),
_mesa_enum_to_string(target));
return NULL;
}
}
return texObj;
}
/**
* Common code to implement all the glTexImage1D/2D/3D functions,
@ -3274,69 +3334,6 @@ _mesa_EGLImageTargetTexture2DOES (GLenum target, GLeglImageOES image)
_mesa_unlock_texture(ctx, texObj);
}
static struct gl_texture_object *
lookup_texture_ext_dsa(struct gl_context *ctx, GLenum target, GLuint texture,
const char *caller)
{
GLenum boundTarget;
switch (target) {
case GL_TEXTURE_CUBE_MAP_POSITIVE_X:
case GL_TEXTURE_CUBE_MAP_NEGATIVE_X:
case GL_TEXTURE_CUBE_MAP_POSITIVE_Y:
case GL_TEXTURE_CUBE_MAP_NEGATIVE_Y:
case GL_TEXTURE_CUBE_MAP_POSITIVE_Z:
case GL_TEXTURE_CUBE_MAP_NEGATIVE_Z:
boundTarget = GL_TEXTURE_CUBE_MAP;
break;
default:
boundTarget = target;
break;
}
int targetIndex = _mesa_tex_target_to_index(ctx, boundTarget);
if (targetIndex < 0) {
_mesa_error(ctx, GL_INVALID_ENUM, "%s(target = %s)", caller,
_mesa_enum_to_string(target));
return NULL;
}
assert(targetIndex < NUM_TEXTURE_TARGETS);
struct gl_texture_object *texObj;
if (texture == 0) {
/* Use a default texture object */
texObj = ctx->Shared->DefaultTex[targetIndex];
assert(texObj);
} else {
texObj = _mesa_lookup_texture(ctx, texture);
if (!texObj && ctx->API == API_OPENGL_CORE) {
_mesa_error(ctx, GL_INVALID_OPERATION, "%s(non-gen name)", caller);
return NULL;
}
if (!texObj) {
texObj = ctx->Driver.NewTextureObject(ctx, texture, boundTarget);
if (!texObj) {
_mesa_error(ctx, GL_OUT_OF_MEMORY, "%s", caller);
return NULL;
}
/* insert into hash table */
_mesa_HashInsert(ctx->Shared->TexObjects, texObj->Name, texObj);
}
if (texObj->Target != boundTarget) {
_mesa_error(ctx, GL_INVALID_OPERATION, "%s(%s != %s)",
caller, _mesa_enum_to_string(texObj->Target),
_mesa_enum_to_string(target));
return NULL;
}
}
return texObj;
}
/**
* Helper that implements the glTexSubImage1/2/3D()
* and glTextureSubImage1/2/3D() functions.