summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuel Pitoiset <[email protected]>2017-06-14 11:27:40 +0200
committerSamuel Pitoiset <[email protected]>2017-06-18 14:20:57 +0200
commitd7bee4a022ffacb2043cd6e498a742f719a8a59d (patch)
treed715031bdd6ae3de0cc44607ff8a10fc715f548c
parent6ff6863c329434cfc3d1424db7ca0f614eff63fd (diff)
mesa: add KHR_no_error support for glIs{Image,Texture}HandleResidentARB()
Signed-off-by: Samuel Pitoiset <[email protected]> Reviewed-by: Timothy Arceri <[email protected]>
-rw-r--r--src/mapi/glapi/gen/ARB_bindless_texture.xml4
-rw-r--r--src/mesa/main/texturebindless.c14
-rw-r--r--src/mesa/main/texturebindless.h7
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
@@ -870,6 +870,13 @@ _mesa_MakeImageHandleNonResidentARB(GLuint64 handle)
}
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)
{
GET_CURRENT_CONTEXT(ctx);
@@ -896,6 +903,13 @@ _mesa_IsTextureHandleResidentARB(GLuint64 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)
{
GET_CURRENT_CONTEXT(ctx);
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
@@ -87,7 +87,14 @@ 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);