summaryrefslogtreecommitdiffstats
path: root/src/glx/dri_glx.c
diff options
context:
space:
mode:
authorKyle Brenneman <kbrenneman@nvidia.com>2016-05-11 14:01:53 -0400
committerEmil Velikov <emil.l.velikov@gmail.com>2016-05-30 16:29:49 +0100
commit22a9e00aab66d3dd6890e9eaac3f429c0ddec17e (patch)
treecd4568b2381dd25cfa611bc6bc676016d89b6f2f /src/glx/dri_glx.c
parentcee459d84de7533d0e0a74a37f7fc4c0f2b77bcf (diff)
downloadexternal_mesa3d-22a9e00aab66d3dd6890e9eaac3f429c0ddec17e.zip
external_mesa3d-22a9e00aab66d3dd6890e9eaac3f429c0ddec17e.tar.gz
external_mesa3d-22a9e00aab66d3dd6890e9eaac3f429c0ddec17e.tar.bz2
glx: Implement the libglvnd interface.
With reference to the libglvnd branch: https://cgit.freedesktop.org/mesa/mesa/log/?h=libglvnd This is a squashed commit containing all of Kyle's commits, all but two of Emil's commits (to follow), and a small fixup from myself to mark the rest of the glX* functions as _GLX_PUBLIC so they are not exported when building for libglvnd. I (ajax) squashed them together both for ease of review, and because most of the changes are un-useful intermediate states representing the evolution of glvnd's internal API. Co-author: Emil Velikov <emil.velikov@collabora.com> Reviewed-by: Adam Jackson <ajax@redhat.com>
Diffstat (limited to 'src/glx/dri_glx.c')
-rw-r--r--src/glx/dri_glx.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/glx/dri_glx.c b/src/glx/dri_glx.c
index d087751..d61ffa3 100644
--- a/src/glx/dri_glx.c
+++ b/src/glx/dri_glx.c
@@ -148,7 +148,7 @@ driGetDriverName(Display * dpy, int scrNum, char **driverName)
* The returned char pointer points to a static array that will be
* overwritten by subsequent calls.
*/
-_X_EXPORT const char *
+_GLX_PUBLIC const char *
glXGetScreenDriver(Display * dpy, int scrNum)
{
static char ret[32];
@@ -178,7 +178,7 @@ glXGetScreenDriver(Display * dpy, int scrNum)
*
* Note: The driver remains opened after this function returns.
*/
-_X_EXPORT const char *
+_GLX_PUBLIC const char *
glXGetDriverConfig(const char *driverName)
{
void *handle = driOpenDriver(driverName);