Skip to content

FIX(overlay_gl): modernise OpenGL overlay with core profile rendering #7138

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ChrisLane wants to merge 3 commits into
base: master
Choose a base branch
from
+450 −195
Open

FIX(overlay_gl): modernise OpenGL overlay with core profile rendering #7138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
23c1346
FIX(overlay_gl): Modernise OpenGL overlay to use core profile rendering
ChrisLane Mar 15, 2026
46170f4
FIX(overlay): Remove debug echo from library detection script
ChrisLane Mar 24, 2026
07effa2
FORMAT(overlay_gl): Apply clang-format to changed files
ChrisLane Mar 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion auxiliary_files/run_scripts/mumble-overlay.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ for libpath in @MUMBLE_INSTALL_ABS_LIBDIR@ /usr/lib /usr/lib/mumble /usr/lib32 /
for lib in $libpath/lib@MUMBLE_OVERLAY_BINARY_BASENAME@*.so
do
case $(file -L "$lib") in
*64-bit*) MUMBLE_OVERLAY_PATH_64="$lib" ; echo set ;;
*64-bit*) MUMBLE_OVERLAY_PATH_64="$lib" ;;
*32-bit*) MUMBLE_OVERLAY_PATH_32="$lib" ;;
esac
done
Expand Down
26 changes: 13 additions & 13 deletions overlay_gl/avail_mac.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,19 @@

// This file was auto-generated by 'avail_mac.pl'. Do not touch by hand.

#define AVAIL_ALL_GLSYM \
(AVAIL(glActiveTexture) && AVAIL(glAttachShader) && AVAIL(glBindBuffer) && AVAIL(glBindTexture) \
&& AVAIL(glBlendFunc) && AVAIL(glColorMaterial) && AVAIL(glCompileShader) && AVAIL(glCreateProgram) \
&& AVAIL(glCreateShader) && AVAIL(glDeleteTextures) && AVAIL(glDisable) && AVAIL(glDisableClientState) \
&& AVAIL(glDisableVertexAttribArray) && AVAIL(glDrawArrays) && AVAIL(glEnable) && AVAIL(glEnableClientState) \
&& AVAIL(glEnableVertexAttribArray) && AVAIL(glGenTextures) && AVAIL(glGetBooleanv) && AVAIL(glGetError) \
&& AVAIL(glGetIntegerv) && AVAIL(glGetShaderInfoLog) && AVAIL(glGetString) && AVAIL(glGetTexParameterfv) \
&& AVAIL(glGetUniformLocation) && AVAIL(glGetVertexAttribiv) && AVAIL(glIsTexture) && AVAIL(glLinkProgram) \
&& AVAIL(glLoadIdentity) && AVAIL(glMatrixMode) && AVAIL(glOrtho) && AVAIL(glPixelStorei) && AVAIL(glPopAttrib) \
&& AVAIL(glPopClientAttrib) && AVAIL(glPopMatrix) && AVAIL(glPushAttrib) && AVAIL(glPushClientAttrib) \
&& AVAIL(glPushMatrix) && AVAIL(glRenderMode) && AVAIL(glShaderSource) && AVAIL(glTexCoordPointer) \
&& AVAIL(glTexEnvi) && AVAIL(glTexImage2D) && AVAIL(glTexParameterfv) && AVAIL(glTexParameteri) \
&& AVAIL(glTexSubImage2D) && AVAIL(glUniform1i) && AVAIL(glUseProgram) && AVAIL(glVertexPointer) \
#define AVAIL_ALL_GLSYM \
(AVAIL(glActiveTexture) && AVAIL(glAttachShader) && AVAIL(glBindBuffer) && AVAIL(glBindFramebuffer) \
&& AVAIL(glBindTexture) && AVAIL(glBindVertexArray) && AVAIL(glBlendEquation) && AVAIL(glBlendEquationSeparate) \
&& AVAIL(glBlendFunc) && AVAIL(glBlendFuncSeparate) && AVAIL(glBufferData) && AVAIL(glBufferSubData) \
&& AVAIL(glColorMask) && AVAIL(glCompileShader) && AVAIL(glCreateProgram) && AVAIL(glCreateShader) \
&& AVAIL(glDeleteShader) && AVAIL(glDeleteTextures) && AVAIL(glDisable) && AVAIL(glDrawArrays) && AVAIL(glEnable) \
&& AVAIL(glEnableVertexAttribArray) && AVAIL(glGenBuffers) && AVAIL(glGenTextures) && AVAIL(glGenVertexArrays) \
&& AVAIL(glGetBooleanv) && AVAIL(glGetError) && AVAIL(glGetIntegerv) && AVAIL(glGetProgramInfoLog) \
&& AVAIL(glGetProgramiv) && AVAIL(glGetShaderInfoLog) && AVAIL(glGetShaderiv) && AVAIL(glGetString) \
&& AVAIL(glGetTexParameterfv) && AVAIL(glGetUniformLocation) && AVAIL(glIsEnabled) && AVAIL(glIsTexture) \
&& AVAIL(glLinkProgram) && AVAIL(glPixelStorei) && AVAIL(glPolygonMode) && AVAIL(glShaderSource) \
&& AVAIL(glTexImage2D) && AVAIL(glTexParameterfv) && AVAIL(glTexParameteri) && AVAIL(glTexSubImage2D) \
&& AVAIL(glUniform1i) && AVAIL(glUniformMatrix4fv) && AVAIL(glUseProgram) && AVAIL(glVertexAttribPointer) \
&& AVAIL(glViewport) && 1)

#endif
3 changes: 2 additions & 1 deletion overlay_gl/init_unix.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ __attribute__((visibility("default"))) void glXSwapBuffers(Display *dpy, GLXDraw
if (!oglXSwapBuffers) {
resolveOpenGL();
}
resolveGLFunctions();

GLXContext ctx = glXGetCurrentContext();

Expand Down Expand Up @@ -210,7 +211,7 @@ static int find_odlsym() {
#else
const uintptr_t base = (uintptr_t) lm->l_addr;
#endif
for (const Elf_Dyn *dyn = lm->l_ld; dyn; ++dyn) {
for (const Elf_Dyn *dyn = lm->l_ld; dyn->d_tag != DT_NULL; ++dyn) {
switch (dyn->d_tag) {
case DT_GNU_HASH:
if (!hashTable) {
Expand Down
Loading
Loading