KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mesa: refactor GenerateTextureMipmap handling 

Rework _mesa_GenerateTextureMipmap to allow code sharing with EXT_dsa functions.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
This commit is contained in:
Pierre-Eric Pelloux-Prayer 2019-09-11 09:58:47 +02:00
parent cfc0ebe7f1
commit fb804266a3
1 changed files with 29 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
src/mesa/main/genmipmap.c
View File

@ -106,14 +106,14 @@ _mesa_is_valid_generate_texture_mipmap_internalformat(struct gl_context *ctx,
/**
* Implements glGenerateMipmap and glGenerateTextureMipmap.
* Generates all the mipmap levels below the base level.
* Error-checking is done only if caller is not NULL.
*/
static ALWAYS_INLINE void
generate_texture_mipmap(struct gl_context *ctx,
struct gl_texture_object *texObj, GLenum target,
bool dsa, bool no_error)
const char* caller)
{
struct gl_texture_image *srcImage;
const char *suffix = dsa ? "Texture" : "";
FLUSH_VERTICES(ctx, 0);
@ -122,21 +122,21 @@ generate_texture_mipmap(struct gl_context *ctx,
return;
}
if (!no_error && texObj->Target == GL_TEXTURE_CUBE_MAP &&
if (caller && texObj->Target == GL_TEXTURE_CUBE_MAP &&
!_mesa_cube_complete(texObj)) {
_mesa_error(ctx, GL_INVALID_OPERATION,
"glGenerate%sMipmap(incomplete cube map)", suffix);
"%s(incomplete cube map)", caller);
return;
}
_mesa_lock_texture(ctx, texObj);
srcImage = _mesa_select_tex_image(texObj, target, texObj->BaseLevel);
if (!no_error) {
if (caller) {
if (!srcImage) {
_mesa_unlock_texture(ctx, texObj);
_mesa_error(ctx, GL_INVALID_OPERATION,
"glGenerate%sMipmap(zero size base image)", suffix);
"%s(zero size base image)", caller);
return;
}
@ -144,7 +144,7 @@ generate_texture_mipmap(struct gl_context *ctx,
srcImage->InternalFormat)) {
_mesa_unlock_texture(ctx, texObj);
_mesa_error(ctx, GL_INVALID_OPERATION,
"glGenerate%sMipmap(invalid internal format %s)", suffix,
"%s(invalid internal format %s)", caller,
_mesa_enum_to_string(srcImage->InternalFormat));
return;
}
@ -168,22 +168,6 @@ generate_texture_mipmap(struct gl_context *ctx,
_mesa_unlock_texture(ctx, texObj);
}
static void
generate_texture_mipmap_error(struct gl_context *ctx,
struct gl_texture_object *texObj, GLenum target,
bool dsa)
{
generate_texture_mipmap(ctx, texObj, target, dsa, false);
}
static void
generate_texture_mipmap_no_error(struct gl_context *ctx,
struct gl_texture_object *texObj,
GLenum target, bool dsa)
{
generate_texture_mipmap(ctx, texObj, target, dsa, true);
}
/**
* Generate all the mipmap levels below the base level.
* Note: this GL function would be more useful if one could specify a
@ -195,7 +179,7 @@ _mesa_GenerateMipmap_no_error(GLenum target)
GET_CURRENT_CONTEXT(ctx);
struct gl_texture_object *texObj = _mesa_get_current_tex_object(ctx, target);
generate_texture_mipmap_no_error(ctx, texObj, target, false);
generate_texture_mipmap(ctx, texObj, target, NULL);
}
void GLAPIENTRY
@ -214,7 +198,7 @@ _mesa_GenerateMipmap(GLenum target)
if (!texObj)
return;
generate_texture_mipmap_error(ctx, texObj, target, false);
generate_texture_mipmap(ctx, texObj, target, "glGenerateMipmap");
}
/**
@ -226,7 +210,25 @@ _mesa_GenerateTextureMipmap_no_error(GLuint texture)
GET_CURRENT_CONTEXT(ctx);
struct gl_texture_object *texObj = _mesa_lookup_texture(ctx, texture);
generate_texture_mipmap_no_error(ctx, texObj, texObj->Target, true);
generate_texture_mipmap(ctx, texObj, texObj->Target, NULL);
}
static void
validate_params_and_generate_mipmap(struct gl_texture_object *texObj, const char* caller)
{
GET_CURRENT_CONTEXT(ctx);
if (!texObj)
return;
if (!_mesa_is_valid_generate_texture_mipmap_target(ctx, texObj->Target)) {
_mesa_error(ctx, GL_INVALID_ENUM, "%s(target=%s)",
caller,
_mesa_enum_to_string(texObj->Target));
return;
}
generate_texture_mipmap(ctx, texObj, texObj->Target, caller);
}
void GLAPIENTRY
@ -236,14 +238,5 @@ _mesa_GenerateTextureMipmap(GLuint texture)
GET_CURRENT_CONTEXT(ctx);
texObj = _mesa_lookup_texture_err(ctx, texture, "glGenerateTextureMipmap");
if (!texObj)
return;
if (!_mesa_is_valid_generate_texture_mipmap_target(ctx, texObj->Target)) {
_mesa_error(ctx, GL_INVALID_ENUM, "glGenerateTextureMipmap(target=%s)",
_mesa_enum_to_string(texObj->Target));
return;
}
generate_texture_mipmap_error(ctx, texObj, texObj->Target, true);
validate_params_and_generate_mipmap(texObj, "glGenerateTextureMipmap");
}