From 1c00af4264d795bf1fb3d13b7a966722a5984c4a Mon Sep 17 00:00:00 2001
From: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Date: Wed, 14 Jun 2017 18:08:09 +0200
Subject: [PATCH] mesa: fix 'make check' by moving bindless functions at the
 right place
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Fixes: 5f249b9f05e ("mapi: add GL_ARB_bindless_texture entry points")
Reported-by: Mark Janes <mark.a.janes@intel.com>
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Tested-by: Aaron Watry <awatry@gmail.com>
Tested-by: Michel Dänzer <michel.daenzer@amd.com>
---
 src/mesa/main/tests/dispatch_sanity.cpp | 36 ++++++++++++-------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/mesa/main/tests/dispatch_sanity.cpp b/src/mesa/main/tests/dispatch_sanity.cpp
index 47d0aa63bf4..724c22ee9b3 100644
--- a/src/mesa/main/tests/dispatch_sanity.cpp
+++ b/src/mesa/main/tests/dispatch_sanity.cpp
@@ -965,6 +965,24 @@ const struct function common_desktop_functions_possible[] = {
    { "glBufferPageCommitmentARB", 43, -1 },
    { "glNamedBufferPageCommitmentARB", 43, -1 },
 
+   /* GL_ARB_bindless_texture */
+   { "glGetTextureHandleARB", 40, -1 },
+   { "glGetTextureSamplerHandleARB", 40, -1 },
+   { "glMakeTextureHandleResidentARB", 40, -1 },
+   { "glMakeTextureHandleNonResidentARB", 40, -1 },
+   { "glIsTextureHandleResidentARB", 40, -1 },
+   { "glGetImageHandleARB", 40, -1 },
+   { "glMakeImageHandleResidentARB", 40, -1 },
+   { "glMakeImageHandleNonResidentARB", 40, -1 },
+   { "glIsImageHandleResidentARB", 40, -1 },
+   { "glUniformHandleui64ARB", 40, -1 },
+   { "glUniformHandleui64vARB", 40, -1 },
+   { "glProgramUniformHandleui64ARB", 40, -1 },
+   { "glProgramUniformHandleui64vARB", 40, -1 },
+   { "glVertexAttribL1ui64ARB", 40, -1 },
+   { "glVertexAttribL1ui64vARB", 40, -1 },
+   { "glGetVertexAttribLui64vARB", 40, -1 },
+
    { NULL, 0, -1 }
 };
 
@@ -2374,24 +2392,6 @@ const struct function gles2_functions_possible[] = {
    /* GL_KHR_blend_equation_advanced */
    { "glBlendBarrierKHR", 20, -1 },
 
-   /* GL_ARB_bindless_texture */
-   { "glGetTextureHandleARB", 40, -1 },
-   { "glGetTextureSamplerHandleARB", 40, -1 },
-   { "glMakeTextureHandleResidentARB", 40, -1 },
-   { "glMakeTextureHandleNonResidentARB", 40, -1 },
-   { "glIsTextureHandleResidentARB", 40, -1 },
-   { "glGetImageHandleARB", 40, -1 },
-   { "glMakeImageHandleResidentARB", 40, -1 },
-   { "glMakeImageHandleNonResidentARB", 40, -1 },
-   { "glIsImageHandleResidentARB", 40, -1 },
-   { "glUniformHandleui64ARB", 40, -1 },
-   { "glUniformHandleui64vARB", 40, -1 },
-   { "glProgramUniformHandleui64ARB", 40, -1 },
-   { "glProgramUniformHandleui64vARB", 40, -1 },
-   { "glVertexAttribL1ui64ARB", 40, -1 },
-   { "glVertexAttribL1ui64vARB", 40, -1 },
-   { "glGetVertexAttribLui64vARB", 40, -1 },
-
    { NULL, 0, -1 }
 };
 
-- 
2.30.2