Mesa (master): glx: Fix build since 679c2ef "glx/drisw: add support for DRI2rendererQueryExtension", when only building drisw renderer
Jon TURNEY
jturney at kemper.freedesktop.org
Thu Aug 21 16:00:19 UTC 2014
Module: Mesa
Branch: master
Commit: 3fe7daec14282dc8e2f5c8cc547927e305009677
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=3fe7daec14282dc8e2f5c8cc547927e305009677
Author: Jon TURNEY <jon.turney at dronecode.org.uk>
Date: Sun Aug 17 17:22:22 2014 +0100
glx: Fix build since 679c2ef "glx/drisw: add support for DRI2rendererQueryExtension", when only building drisw renderer
v2:
- Move dri*_query_renderer_* into their respective dri*_priv.h headers
- Drop then unnneeded include of dri2.h from dri2_query_renderer.c
- Rename dri2_query_renderer.c as dri_common_query_renderer.c, as it's contents
now are used for more than dri[23]
Signed-off-by: Jon TURNEY <jon.turney at dronecode.org.uk>
Reviewed-by: Emil Velikov <emil.l.velikov at gmail.com>
---
src/glx/Makefile.am | 6 +++---
src/glx/dri2.h | 16 ----------------
src/glx/dri2_priv.h | 8 ++++++++
src/glx/dri3_priv.h | 9 +++++++++
...i2_query_renderer.c => dri_common_query_renderer.c} | 1 -
5 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/src/glx/Makefile.am b/src/glx/Makefile.am
index cdd898e..4515312 100644
--- a/src/glx/Makefile.am
+++ b/src/glx/Makefile.am
@@ -96,7 +96,8 @@ endif
if HAVE_DRICOMMON
libglx_la_SOURCES += \
xfont.c \
- dri_common.c
+ dri_common.c \
+ dri_common_query_renderer.c
endif
if HAVE_DRI2
@@ -104,8 +105,7 @@ libglx_la_SOURCES += \
dri_glx.c \
XF86dri.c \
dri2_glx.c \
- dri2.c \
- dri2_query_renderer.c
+ dri2.c
endif
if HAVE_DRI3
diff --git a/src/glx/dri2.h b/src/glx/dri2.h
index d07b296..4be5bf8 100644
--- a/src/glx/dri2.h
+++ b/src/glx/dri2.h
@@ -88,20 +88,4 @@ DRI2CopyRegion(Display * dpy, XID drawable,
XserverRegion region,
CARD32 dest, CARD32 src);
-_X_HIDDEN int
-dri2_query_renderer_integer(struct glx_screen *base, int attribute,
- unsigned int *value);
-
-_X_HIDDEN int
-dri2_query_renderer_string(struct glx_screen *base, int attribute,
- const char **value);
-
-_X_HIDDEN int
-dri3_query_renderer_integer(struct glx_screen *base, int attribute,
- unsigned int *value);
-
-_X_HIDDEN int
-dri3_query_renderer_string(struct glx_screen *base, int attribute,
- const char **value);
-
#endif
diff --git a/src/glx/dri2_priv.h b/src/glx/dri2_priv.h
index c21eee5..b93d158 100644
--- a/src/glx/dri2_priv.h
+++ b/src/glx/dri2_priv.h
@@ -50,3 +50,11 @@ struct dri2_screen {
int show_fps_interval;
};
+
+_X_HIDDEN int
+dri2_query_renderer_integer(struct glx_screen *base, int attribute,
+ unsigned int *value);
+
+_X_HIDDEN int
+dri2_query_renderer_string(struct glx_screen *base, int attribute,
+ const char **value);
diff --git a/src/glx/dri3_priv.h b/src/glx/dri3_priv.h
index c0e35ee..248fa28 100644
--- a/src/glx/dri3_priv.h
+++ b/src/glx/dri3_priv.h
@@ -195,3 +195,12 @@ struct dri3_drawable {
xcb_gcontext_t gc;
xcb_special_event_t *special_event;
};
+
+
+_X_HIDDEN int
+dri3_query_renderer_integer(struct glx_screen *base, int attribute,
+ unsigned int *value);
+
+_X_HIDDEN int
+dri3_query_renderer_string(struct glx_screen *base, int attribute,
+ const char **value);
diff --git a/src/glx/dri2_query_renderer.c b/src/glx/dri_common_query_renderer.c
similarity index 99%
rename from src/glx/dri2_query_renderer.c
rename to src/glx/dri_common_query_renderer.c
index 247ec1c..d598b12 100644
--- a/src/glx/dri2_query_renderer.c
+++ b/src/glx/dri_common_query_renderer.c
@@ -25,7 +25,6 @@
#include "glxclient.h"
#include "glx_error.h"
-#include "dri2.h"
#include "dri_interface.h"
#include "dri2_priv.h"
#if defined(HAVE_DRI3)
More information about the mesa-commit
mailing list