From d7bee4a022ffacb2043cd6e498a742f719a8a59d Mon Sep 17 00:00:00 2001
From: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Date: Wed, 14 Jun 2017 11:27:40 +0200
Subject: [PATCH] mesa: add KHR_no_error support for
 glIs{Image,Texture}HandleResidentARB()

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
---
 src/mapi/glapi/gen/ARB_bindless_texture.xml |  4 ++--
 src/mesa/main/texturebindless.c             | 14 ++++++++++++++
 src/mesa/main/texturebindless.h             |  7 +++++++
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/src/mapi/glapi/gen/ARB_bindless_texture.xml b/src/mapi/glapi/gen/ARB_bindless_texture.xml
index e57f897a934..916e198a1ee 100644
--- a/src/mapi/glapi/gen/ARB_bindless_texture.xml
+++ b/src/mapi/glapi/gen/ARB_bindless_texture.xml
@@ -69,12 +69,12 @@
       <param name="value" type="const GLuint64 *" />
    </function>
 
-   <function name="IsTextureHandleResidentARB">
+   <function name="IsTextureHandleResidentARB" no_error="true">
       <return type="GLboolean"/>
       <param name="handle" type="GLuint64" />
    </function>
 
-   <function name="IsImageHandleResidentARB">
+   <function name="IsImageHandleResidentARB" no_error="true">
       <return type="GLboolean"/>
       <param name="handle" type="GLuint64" />
    </function>
diff --git a/src/mesa/main/texturebindless.c b/src/mesa/main/texturebindless.c
index 26b0f58bcd2..dac6c569a5e 100644
--- a/src/mesa/main/texturebindless.c
+++ b/src/mesa/main/texturebindless.c
@@ -869,6 +869,13 @@ _mesa_MakeImageHandleNonResidentARB(GLuint64 handle)
    make_image_handle_resident(ctx, imgHandleObj, GL_READ_ONLY, false);
 }
 
+GLboolean GLAPIENTRY
+_mesa_IsTextureHandleResidentARB_no_error(GLuint64 handle)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   return is_texture_handle_resident(ctx, handle);
+}
+
 GLboolean GLAPIENTRY
 _mesa_IsTextureHandleResidentARB(GLuint64 handle)
 {
@@ -895,6 +902,13 @@ _mesa_IsTextureHandleResidentARB(GLuint64 handle)
    return is_texture_handle_resident(ctx, handle);
 }
 
+GLboolean GLAPIENTRY
+_mesa_IsImageHandleResidentARB_no_error(GLuint64 handle)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   return is_image_handle_resident(ctx, handle);
+}
+
 GLboolean GLAPIENTRY
 _mesa_IsImageHandleResidentARB(GLuint64 handle)
 {
diff --git a/src/mesa/main/texturebindless.h b/src/mesa/main/texturebindless.h
index d584f5cc0cc..0fcea61d432 100644
--- a/src/mesa/main/texturebindless.h
+++ b/src/mesa/main/texturebindless.h
@@ -86,8 +86,15 @@ _mesa_MakeImageHandleResidentARB(GLuint64 handle, GLenum access);
 void GLAPIENTRY
 _mesa_MakeImageHandleNonResidentARB(GLuint64 handle);
 
+GLboolean GLAPIENTRY
+_mesa_IsTextureHandleResidentARB_no_error(GLuint64 handle);
+
 GLboolean GLAPIENTRY
 _mesa_IsTextureHandleResidentARB(GLuint64 handle);
+
+GLboolean GLAPIENTRY
+_mesa_IsImageHandleResidentARB_no_error(GLuint64 handle);
+
 GLboolean GLAPIENTRY
 _mesa_IsImageHandleResidentARB(GLuint64 handle);
 
-- 
2.30.2