From 47d08dbde7ef9698a02252d8d1385d8d20dadcc3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= <marek.olsak@amd.com>
Date: Wed, 12 Mar 2025 00:09:44 -0400
Subject: [PATCH] glx: stop exporting EXT_texture_object functions from
 libGLX_mesa.so

These aliases of the non-EXT functions have a non-aliased indirect GLX
implementation. Remove it since it's not needed.

Reviewed-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34002>
---
 src/glx/glvnd-symbols.txt     |  6 -----
 src/glx/single2.c             | 44 -----------------------------------
 src/mapi/glapi/gen/gl_API.xml |  4 ----
 3 files changed, 54 deletions(-)

diff --git a/src/glx/glvnd-symbols.txt b/src/glx/glvnd-symbols.txt
index 4710aa1d53b..ada2c71dd29 100644
--- a/src/glx/glvnd-symbols.txt
+++ b/src/glx/glvnd-symbols.txt
@@ -2,9 +2,3 @@ __glx_Main
 MesaGLInteropGLXExportObject
 MesaGLInteropGLXFlushObjects
 MesaGLInteropGLXQueryDeviceInfo
-
-# TODO: These shouldn't be exported:
-glAreTexturesResidentEXT
-glDeleteTexturesEXT
-glGenTexturesEXT
-glIsTextureEXT
diff --git a/src/glx/single2.c b/src/glx/single2.c
index 4c504c27095..5d1b119196a 100644
--- a/src/glx/single2.c
+++ b/src/glx/single2.c
@@ -841,47 +841,3 @@ __indirect_glAreTexturesResident(GLsizei n, const GLuint * textures,
    }
    return retval;
 }
-
-
-/**
- * This was previously auto-generated, but we need to special-case
- * how we handle writing into the 'residences' buffer when n%4!=0.
- */
-#define X_GLvop_AreTexturesResidentEXT 11
-GLboolean
-glAreTexturesResidentEXT(GLsizei n, const GLuint * textures,
-                         GLboolean * residences)
-{
-   struct glx_context *const gc = __glXGetCurrentContext();
-
-   if (gc->isDirect) {
-      return CALL_AreTexturesResident(GET_DISPATCH(), (n, textures, residences));
-   }
-   else {
-      struct glx_context *const gc = __glXGetCurrentContext();
-      Display *const dpy = gc->currentDpy;
-      GLboolean retval = (GLboolean) 0;
-      const GLuint cmdlen = 4 + __GLX_PAD((n * 4));
-      if (__builtin_expect((n >= 0) && (dpy != NULL), 1)) {
-         GLubyte const *pc =
-            __glXSetupVendorRequest(gc, X_GLXVendorPrivateWithReply,
-                                    X_GLvop_AreTexturesResidentEXT,
-                                    cmdlen);
-         (void) memcpy((void *) (pc + 0), (void *) (&n), 4);
-         (void) memcpy((void *) (pc + 4), (void *) (textures), (n * 4));
-         if (n & 3) {
-            /* see comments in __indirect_glAreTexturesResident() */
-            GLboolean *res4 = malloc((n + 3) & ~3);
-            retval = (GLboolean) __glXReadReply(dpy, 1, res4, GL_TRUE);
-            memcpy(residences, res4, n);
-            free(res4);
-         }
-         else {
-            retval = (GLboolean) __glXReadReply(dpy, 1, residences, GL_TRUE);
-         }
-         UnlockDisplay(dpy);
-         SyncHandle();
-      }
-      return retval;
-   }
-}
diff --git a/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml
index c838b32ad46..d75d6399215 100644
--- a/src/mapi/glapi/gen/gl_API.xml
+++ b/src/mapi/glapi/gen/gl_API.xml
@@ -8591,7 +8591,6 @@
         <param name="textures" type="const GLuint *" count="n"/>
         <param name="residences" type="GLboolean *" output="true" count="n"/>
         <return type="GLboolean"/>
-        <glx vendorpriv="11" handcode="client" always_array="true"/>
     </function>
 
     <function name="BindTextureEXT" alias="BindTexture">
@@ -8602,19 +8601,16 @@
     <function name="DeleteTexturesEXT" alias="DeleteTextures">
         <param name="n" type="GLsizei" counter="true"/>
         <param name="textures" type="const GLuint *" count="n"/>
-        <glx vendorpriv="12"/>
     </function>
 
     <function name="GenTexturesEXT" alias="GenTextures">
         <param name="n" type="GLsizei" counter="true"/>
         <param name="textures" type="GLuint *" output="true" count="n"/>
-        <glx vendorpriv="13" always_array="true"/>
     </function>
 
     <function name="IsTextureEXT" alias="IsTexture">
         <param name="texture" type="GLuint"/>
         <return type="GLboolean"/>
-        <glx vendorpriv="14"/>
     </function>
 
     <function name="PrioritizeTexturesEXT" alias="PrioritizeTextures">