|| !ctx->Extensions.EXT_texture_array;
break;
case GL_TEXTURE_CUBE_MAP_ARRAY:
- error = !_mesa_has_ARB_texture_cube_map_array(ctx);
+ error = !_mesa_has_texture_cube_map_array(ctx);
break;
default:
error = true;
* Implements glGenerateMipmap and glGenerateTextureMipmap.
* Generates all the mipmap levels below the base level.
*/
-void
-_mesa_generate_texture_mipmap(struct gl_context *ctx,
- struct gl_texture_object *texObj, GLenum target,
- bool dsa)
+static ALWAYS_INLINE void
+generate_texture_mipmap(struct gl_context *ctx,
+ struct gl_texture_object *texObj, GLenum target,
+ bool dsa, bool no_error)
{
struct gl_texture_image *srcImage;
const char *suffix = dsa ? "Texture" : "";
return;
}
- if (texObj->Target == GL_TEXTURE_CUBE_MAP &&
+ if (!no_error && texObj->Target == GL_TEXTURE_CUBE_MAP &&
!_mesa_cube_complete(texObj)) {
_mesa_error(ctx, GL_INVALID_OPERATION,
"glGenerate%sMipmap(incomplete cube map)", suffix);
_mesa_lock_texture(ctx, texObj);
srcImage = _mesa_select_tex_image(texObj, target, texObj->BaseLevel);
- if (!srcImage) {
- _mesa_unlock_texture(ctx, texObj);
- _mesa_error(ctx, GL_INVALID_OPERATION,
- "glGenerate%sMipmap(zero size base image)", suffix);
- return;
- }
+ if (!no_error) {
+ if (!srcImage) {
+ _mesa_unlock_texture(ctx, texObj);
+ _mesa_error(ctx, GL_INVALID_OPERATION,
+ "glGenerate%sMipmap(zero size base image)", suffix);
+ return;
+ }
- if (!_mesa_is_valid_generate_texture_mipmap_internalformat(ctx,
- srcImage->InternalFormat)) {
- _mesa_unlock_texture(ctx, texObj);
- _mesa_error(ctx, GL_INVALID_OPERATION,
- "glGenerate%sMipmap(invalid internal format %s)", suffix,
- _mesa_enum_to_string(srcImage->InternalFormat));
- return;
+ if (!_mesa_is_valid_generate_texture_mipmap_internalformat(ctx,
+ srcImage->InternalFormat)) {
+ _mesa_unlock_texture(ctx, texObj);
+ _mesa_error(ctx, GL_INVALID_OPERATION,
+ "glGenerate%sMipmap(invalid internal format %s)", suffix,
+ _mesa_enum_to_string(srcImage->InternalFormat));
+ return;
+ }
}
if (srcImage->Width == 0 || srcImage->Height == 0) {
_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
* cube face, a set of array slices, etc.
*/
+void GLAPIENTRY
+_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);
+}
+
void GLAPIENTRY
_mesa_GenerateMipmap(GLenum target)
{
if (!texObj)
return;
- _mesa_generate_texture_mipmap(ctx, texObj, target, false);
+ generate_texture_mipmap_error(ctx, texObj, target, false);
}
/**
* Generate all the mipmap levels below the base level.
*/
+void GLAPIENTRY
+_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);
+}
+
void GLAPIENTRY
_mesa_GenerateTextureMipmap(GLuint texture)
{
return;
}
- _mesa_generate_texture_mipmap(ctx, texObj, texObj->Target, true);
+ generate_texture_mipmap_error(ctx, texObj, texObj->Target, true);
}