aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/drivers/dri/common
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2014-05-29 20:50:12 +0200
committermarha <marha@users.sourceforge.net>2014-05-29 20:50:12 +0200
commitaec798fb4dc72d616732d0fa711faffaa8cd7590 (patch)
tree2814dfe69e7fb25b57492244d5cfa59d80fc8837 /mesalib/src/mesa/drivers/dri/common
parent78c6c2b88ae54977a2a617f116a1598657a98b6f (diff)
parent816a5430313e07083c5325f0a430126a2e10ec41 (diff)
downloadvcxsrv-aec798fb4dc72d616732d0fa711faffaa8cd7590.tar.gz
vcxsrv-aec798fb4dc72d616732d0fa711faffaa8cd7590.tar.bz2
vcxsrv-aec798fb4dc72d616732d0fa711faffaa8cd7590.zip
Merge remote-tracking branch 'origin/released'
Conflicts: mesalib/src/mesa/drivers/dri/common/dri_util.c
Diffstat (limited to 'mesalib/src/mesa/drivers/dri/common')
-rwxr-xr-xmesalib/src/mesa/drivers/dri/common/dri_util.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/mesalib/src/mesa/drivers/dri/common/dri_util.c b/mesalib/src/mesa/drivers/dri/common/dri_util.c
index bb07a9541..f4fc1b1a8 100755
--- a/mesalib/src/mesa/drivers/dri/common/dri_util.c
+++ b/mesalib/src/mesa/drivers/dri/common/dri_util.c
@@ -52,7 +52,7 @@
#include "main/errors.h"
#include "main/macros.h"
-PUBLIC const char __dri2ConfigOptions[] =
+const char __dri2ConfigOptions[] =
DRI_CONF_BEGIN
DRI_CONF_SECTION_PERFORMANCE
DRI_CONF_VBLANK_MODE(DRI_CONF_VBLANK_DEF_INTERVAL_1)
@@ -736,7 +736,7 @@ driSwapBuffers(__DRIdrawable *pdp)
/** Core interface */
const __DRIcoreExtension driCoreExtension = {
- /*.base =*/ { __DRI_CORE, __DRI_CORE_VERSION },
+ /*.base =*/ { __DRI_CORE, 1 },
/*.createNewScreen =*/ NULL,
/*.destroyScreen =*/ driDestroyScreen,