[Mesa-dev] [PATCH 041/101] mesa: add KHR_no_error support to glGenerate*Mipmap()
Samuel Pitoiset
samuel.pitoiset at gmail.com
Fri Jul 21 17:39:50 UTC 2017
Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
---
src/mapi/glapi/gen/ARB_direct_state_access.xml | 2 +-
src/mapi/glapi/gen/ARB_framebuffer_object.xml | 2 +-
src/mesa/main/genmipmap.c | 26 ++++++++++++++++++++++++++
src/mesa/main/genmipmap.h | 6 ++++++
4 files changed, 34 insertions(+), 2 deletions(-)
diff --git a/src/mapi/glapi/gen/ARB_direct_state_access.xml b/src/mapi/glapi/gen/ARB_direct_state_access.xml
index 4439c5bcbe..54276ea59d 100644
--- a/src/mapi/glapi/gen/ARB_direct_state_access.xml
+++ b/src/mapi/glapi/gen/ARB_direct_state_access.xml
@@ -514,7 +514,7 @@
<param name="param" type="const GLint *" />
</function>
- <function name="GenerateTextureMipmap">
+ <function name="GenerateTextureMipmap" no_error="true">
<param name="texture" type="GLuint" />
</function>
diff --git a/src/mapi/glapi/gen/ARB_framebuffer_object.xml b/src/mapi/glapi/gen/ARB_framebuffer_object.xml
index b8fff92620..380d4954e6 100644
--- a/src/mapi/glapi/gen/ARB_framebuffer_object.xml
+++ b/src/mapi/glapi/gen/ARB_framebuffer_object.xml
@@ -285,7 +285,7 @@
<glx rop="4330"/>
</function>
- <function name="GenerateMipmap" es2="2.0">
+ <function name="GenerateMipmap" es2="2.0" no_error="true">
<param name="target" type="GLenum"/>
<glx rop="4325"/>
</function>
diff --git a/src/mesa/main/genmipmap.c b/src/mesa/main/genmipmap.c
index 9eb83cf85f..488c32f810 100644
--- a/src/mesa/main/genmipmap.c
+++ b/src/mesa/main/genmipmap.c
@@ -176,12 +176,29 @@ generate_texture_mipmap_error(struct gl_context *ctx,
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)
{
struct gl_texture_object *texObj;
@@ -204,6 +221,15 @@ _mesa_GenerateMipmap(GLenum target)
* 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)
{
struct gl_texture_object *texObj;
diff --git a/src/mesa/main/genmipmap.h b/src/mesa/main/genmipmap.h
index 94f7f7a680..681c9d9087 100644
--- a/src/mesa/main/genmipmap.h
+++ b/src/mesa/main/genmipmap.h
@@ -35,9 +35,15 @@ bool
_mesa_is_valid_generate_texture_mipmap_internalformat(struct gl_context *ctx,
GLenum internalformat);
+void GLAPIENTRY
+_mesa_GenerateMipmap_no_error(GLenum target);
+
extern void GLAPIENTRY
_mesa_GenerateMipmap(GLenum target);
+void GLAPIENTRY
+_mesa_GenerateTextureMipmap_no_error(GLuint texture);
+
extern void GLAPIENTRY
_mesa_GenerateTextureMipmap(GLuint texture);
--
2.13.3
More information about the mesa-dev
mailing list