summaryrefslogtreecommitdiffstats
path: root/src/mesa/main
diff options
context:
space:
mode:
authorSamuel Pitoiset <[email protected]>2017-07-18 18:02:51 +0200
committerSamuel Pitoiset <[email protected]>2017-07-31 13:53:39 +0200
commitc88649246f85415073cc8fd922ab039a067c89ee (patch)
treed325909c013953abfe0983addf76badd096165f5 /src/mesa/main
parentfee507b9092e0998c3f7e710b0d2feb3f191fec3 (diff)
mesa: add KHR_no_error support to glInvalidate*()
These are just no-op because we don't actually do anything useful in the errors path. Signed-off-by: Samuel Pitoiset <[email protected]> Reviewed-by: Timothy Arceri <[email protected]>
Diffstat (limited to 'src/mesa/main')
-rw-r--r--src/mesa/main/fbobject.c17
-rw-r--r--src/mesa/main/fbobject.h8
-rw-r--r--src/mesa/main/texobj.c17
-rw-r--r--src/mesa/main/texobj.h8
4 files changed, 50 insertions, 0 deletions
diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c
index 46bc129effc..3ab6b53355b 100644
--- a/src/mesa/main/fbobject.c
+++ b/src/mesa/main/fbobject.c
@@ -4326,6 +4326,15 @@ invalid_enum:
void GLAPIENTRY
+_mesa_InvalidateSubFramebuffer_no_error(GLenum target, GLsizei numAttachments,
+ const GLenum *attachments, GLint x,
+ GLint y, GLsizei width, GLsizei height)
+{
+ /* no-op */
+}
+
+
+void GLAPIENTRY
_mesa_InvalidateSubFramebuffer(GLenum target, GLsizei numAttachments,
const GLenum *attachments, GLint x, GLint y,
GLsizei width, GLsizei height)
@@ -4377,6 +4386,14 @@ _mesa_InvalidateNamedFramebufferSubData(GLuint framebuffer,
void GLAPIENTRY
+_mesa_InvalidateFramebuffer_no_error(GLenum target, GLsizei numAttachments,
+ const GLenum *attachments)
+{
+ /* no-op */
+}
+
+
+void GLAPIENTRY
_mesa_InvalidateFramebuffer(GLenum target, GLsizei numAttachments,
const GLenum *attachments)
{
diff --git a/src/mesa/main/fbobject.h b/src/mesa/main/fbobject.h
index 6e10c187427..c67785a2850 100644
--- a/src/mesa/main/fbobject.h
+++ b/src/mesa/main/fbobject.h
@@ -306,6 +306,11 @@ extern void GLAPIENTRY
_mesa_GetNamedFramebufferParameteriv(GLuint framebuffer, GLenum pname,
GLint *param);
+void GLAPIENTRY
+_mesa_InvalidateSubFramebuffer_no_error(GLenum target, GLsizei numAttachments,
+ const GLenum *attachments, GLint x,
+ GLint y, GLsizei width, GLsizei height);
+
extern void GLAPIENTRY
_mesa_InvalidateSubFramebuffer(GLenum target, GLsizei numAttachments,
const GLenum *attachments, GLint x, GLint y,
@@ -317,6 +322,9 @@ _mesa_InvalidateNamedFramebufferSubData(GLuint framebuffer,
const GLenum *attachments,
GLint x, GLint y,
GLsizei width, GLsizei height);
+void GLAPIENTRY
+_mesa_InvalidateFramebuffer_no_error(GLenum target, GLsizei numAttachments,
+ const GLenum *attachments);
extern void GLAPIENTRY
_mesa_InvalidateFramebuffer(GLenum target, GLsizei numAttachments,
diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c
index e52ad22645b..95f2b34337d 100644
--- a/src/mesa/main/texobj.c
+++ b/src/mesa/main/texobj.c
@@ -2029,6 +2029,16 @@ _mesa_unlock_context_textures( struct gl_context *ctx )
void GLAPIENTRY
+_mesa_InvalidateTexSubImage_no_error(GLuint texture, GLint level, GLint xoffset,
+ GLint yoffset, GLint zoffset,
+ GLsizei width, GLsizei height,
+ GLsizei depth)
+{
+ /* no-op */
+}
+
+
+void GLAPIENTRY
_mesa_InvalidateTexSubImage(GLuint texture, GLint level, GLint xoffset,
GLint yoffset, GLint zoffset, GLsizei width,
GLsizei height, GLsizei depth)
@@ -2176,6 +2186,13 @@ _mesa_InvalidateTexSubImage(GLuint texture, GLint level, GLint xoffset,
void GLAPIENTRY
+_mesa_InvalidateTexImage_no_error(GLuint texture, GLint level)
+{
+ /* no-op */
+}
+
+
+void GLAPIENTRY
_mesa_InvalidateTexImage(GLuint texture, GLint level)
{
GET_CURRENT_CONTEXT(ctx);
diff --git a/src/mesa/main/texobj.h b/src/mesa/main/texobj.h
index f10623899fc..9b9e4185d7b 100644
--- a/src/mesa/main/texobj.h
+++ b/src/mesa/main/texobj.h
@@ -218,10 +218,18 @@ _mesa_AreTexturesResident( GLsizei n, const GLuint *textures,
extern GLboolean GLAPIENTRY
_mesa_IsTexture( GLuint texture );
+void GLAPIENTRY
+_mesa_InvalidateTexSubImage_no_error(GLuint texture, GLint level, GLint xoffset,
+ GLint yoffset, GLint zoffset,
+ GLsizei width, GLsizei height,
+ GLsizei depth);
+
extern void GLAPIENTRY
_mesa_InvalidateTexSubImage(GLuint texture, GLint level, GLint xoffset,
GLint yoffset, GLint zoffset, GLsizei width,
GLsizei height, GLsizei depth);
+void GLAPIENTRY
+_mesa_InvalidateTexImage_no_error(GLuint texture, GLint level);
extern void GLAPIENTRY
_mesa_InvalidateTexImage(GLuint texture, GLint level);