Mesa (master): dri_util: cleanup dri extension handling
Emil Velikov
evelikov at kemper.freedesktop.org
Mon Apr 28 18:12:56 UTC 2014
Module: Mesa
Branch: master
Commit: c812557a0e1d6242362460ba6a3aa2012ea9f4b1
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c812557a0e1d6242362460ba6a3aa2012ea9f4b1
Author: Emil Velikov <emil.l.velikov at gmail.com>
Date: Wed Feb 12 20:47:21 2014 +0000
dri_util: cleanup dri extension handling
Explicitly set the version that is implemented, as that may differ from
the one defined in dri_interface.h. The remaining __DRI*Extensions are
treated as constants, so got ahead and declare them as such.
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
---
src/mesa/drivers/dri/common/dri_util.c | 2 +-
src/mesa/drivers/dri/common/dri_util.h | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/mesa/drivers/dri/common/dri_util.c b/src/mesa/drivers/dri/common/dri_util.c
index c410474..248c361 100644
--- a/src/mesa/drivers/dri/common/dri_util.c
+++ b/src/mesa/drivers/dri/common/dri_util.c
@@ -775,7 +775,7 @@ const __DRIswrastExtension driSWRastExtension = {
};
const __DRI2configQueryExtension dri2ConfigQueryExtension = {
- .base = { __DRI2_CONFIG_QUERY, __DRI2_CONFIG_QUERY_VERSION },
+ .base = { __DRI2_CONFIG_QUERY, 1 },
.configQueryb = dri2ConfigQueryb,
.configQueryi = dri2ConfigQueryi,
diff --git a/src/mesa/drivers/dri/common/dri_util.h b/src/mesa/drivers/dri/common/dri_util.h
index a37a0bb..1138bf1 100644
--- a/src/mesa/drivers/dri/common/dri_util.h
+++ b/src/mesa/drivers/dri/common/dri_util.h
@@ -174,13 +174,13 @@ struct __DRIscreenRec {
struct {
/* Flag to indicate that this is a DRI2 screen. Many of the above
* fields will not be valid or initializaed in that case. */
- __DRIdri2LoaderExtension *loader;
- __DRIimageLookupExtension *image;
- __DRIuseInvalidateExtension *useInvalidate;
+ const __DRIdri2LoaderExtension *loader;
+ const __DRIimageLookupExtension *image;
+ const __DRIuseInvalidateExtension *useInvalidate;
} dri2;
struct {
- __DRIimageLoaderExtension *loader;
+ const __DRIimageLoaderExtension *loader;
} image;
driOptionCache optionInfo;
More information about the mesa-commit
mailing list