summaryrefslogtreecommitdiff
path: root/src/glx
diff options
context:
space:
mode:
authorKyle Brenneman <kbrenneman@nvidia.com>2017-01-04 11:31:58 -0700
committerEmil Velikov <emil.l.velikov@gmail.com>2017-04-17 13:03:58 +0100
commitce562f9e3fab769d64b0e5453ec2b4f8710a31ce (patch)
tree5c372e39ba2c33611f145b91224f304a53ab6dd0 /src/glx
parent370df207cadbc1ae60415b3b953f85088e6398d4 (diff)
EGL: Implement the libglvnd interface for EGL (v3)
The new interface mostly just sits on top of the existing library. The only change to the existing EGL code is to split the client extension string into platform extensions and everything else. On non-glvnd builds, eglQueryString will just concatenate the two strings. The EGL dispatch stubs are all generated. The script is based on the one used to generate entrypoints in libglvnd itself. v2: [Kyle] - Rebased against master. - Reworked the EGL makefile to use separate libraries - Made the EGL code generation scripts work with Python 2 and 3. - Change gen_egl_dispatch.py to use argparse for the command line arguments. - Assorted formatting and style cleanup in the Python scripts. v3: [Emil Velikov] - Rebase - Remove separate glvnd glx/egl configure toggles Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Diffstat (limited to 'src/glx')
-rw-r--r--src/glx/Makefile.am2
-rw-r--r--src/glx/glxclient.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/glx/Makefile.am b/src/glx/Makefile.am
index 5c0376408cc..41e4939a0b7 100644
--- a/src/glx/Makefile.am
+++ b/src/glx/Makefile.am
@@ -155,7 +155,7 @@ libglx_la_LIBADD += \
$(builddir)/windows/libwindowsglx.la
endif
-if USE_LIBGLVND_GLX
+if USE_LIBGLVND
AM_CFLAGS += \
-DGL_LIB_NAME=\"lib@GL_LIB@.so.0\" \
$(GLVND_CFLAGS)
diff --git a/src/glx/glxclient.h b/src/glx/glxclient.h
index 70733acb23f..0d29e5635e9 100644
--- a/src/glx/glxclient.h
+++ b/src/glx/glxclient.h
@@ -56,7 +56,7 @@
#include "glxextensions.h"
-#if defined(USE_LIBGLVND_GLX)
+#if defined(USE_LIBGLVND)
#define _GLX_PUBLIC _X_HIDDEN
#else
#define _GLX_PUBLIC _X_EXPORT