fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 19:40:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

glx: stop exporting EXT_texture_object functions from libGLX_mesa.so
Some checks are pending
macOS-CI / macOS-CI (dri) (push) Waiting to run
Details
macOS-CI / macOS-CI (xlib) (push) Waiting to run
Details

Browse source 
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>
This commit is contained in:
Marek Olšák 2025-03-12 00:09:44 -04:00 • committed by Marge Bot
parent 25d1be00a2
commit 47d08dbde7
3 changed files with 0 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/glx/glvnd-symbols.txt
View file

@ -2,9 +2,3 @@ __glx_Main
MesaGLInteropGLXExportObject
MesaGLInteropGLXFlushObjects
MesaGLInteropGLXQueryDeviceInfo
# TODO: These shouldn't be exported:
glAreTexturesResidentEXT
glDeleteTexturesEXT
glGenTexturesEXT
glIsTextureEXT

44
src/glx/single2.c
View file

@ -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;
}
}

4
src/mapi/glapi/gen/gl_API.xml
View file

@ -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">