xserver: Branch 'master' - 4 commits
Keith Packard
keithp at kemper.freedesktop.org
Mon Jan 27 14:09:51 PST 2014
Makefile.am | 6 +++++-
configure.ac | 2 ++
glx/glxdri2.c | 2 +-
glx/glxdricommon.c | 2 +-
include/dix-config.h.in | 3 +++
pseudoramiX/pseudoramiX.c | 8 ++++++++
6 files changed, 20 insertions(+), 3 deletions(-)
New commits:
commit 7ddef4f7033c10b6e92866182d4475a4d49c5083
Author: Keith Packard <keithp at keithp.com>
Date: Wed Jan 22 14:30:28 2014 -0800
Add _XITYPEDEF_POINTER to dix-config.h
Just like the pointer type from Xdefs.h, the Pointer type from
XIproto.h collides with local declarations of variables using the same
name. XIproto.h can use _XITYPEDEF_POINTER to avoid declaring the
unnecessary pointer type.
Signed-off-by: Keith Packard <keithp at keithp.com>
Reviewed-by: Eric Anholt <eric at anholt.net>
diff --git a/include/dix-config.h.in b/include/dix-config.h.in
index 55cfe47..30456cb 100644
--- a/include/dix-config.h.in
+++ b/include/dix-config.h.in
@@ -472,6 +472,9 @@
/* Don't let Xdefs.h define 'pointer' */
#define _XTYPEDEF_POINTER 1
+/* Don't let XIproto define 'Pointer' */
+#define _XITYPEDEF_POINTER 1
+
/* Ask fontsproto to make font path element names const */
#define FONT_PATH_ELEMENT_NAME_CONST 1
commit 0b5a87f37d5dcd2ebff977a3b9a50a75ace93c83
Author: Keith Packard <keithp at keithp.com>
Date: Wed Jan 22 19:17:24 2014 -0800
pseudoramiX: Only compile on XQUARTZ and XWIN
PseudoramiXExtensionInit() is not defined in extinit.h if it won't be
used and we get a compiler warning when compiling the pseudoramiX code.
Signed-off-by: Keith Packard <keithp at keithp.com>
Reviewed-by: Eric Anholt <eric at anholt.net>
diff --git a/Makefile.am b/Makefile.am
index add69d1..b296e0c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,6 +27,10 @@ if PRESENT
PRESENT_DIR=present
endif
+if PSEUDORAMIX
+PSEUDORAMIX_DIR=pseudoramiX
+endif
+
SUBDIRS = \
doc \
man \
@@ -37,11 +41,11 @@ SUBDIRS = \
Xext \
miext \
os \
- pseudoramiX \
randr \
render \
Xi \
xkb \
+ $(PSEUDORAMIX_DIR) \
$(DBE_DIR) \
$(RECORD_DIR) \
xfixes \
diff --git a/configure.ac b/configure.ac
index 560c460..0312c4f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2174,6 +2174,8 @@ if test "x$XQUARTZ" = xyes; then
fi
fi
+AM_CONDITIONAL(PSEUDORAMIX, [test "x$XQUARTZ" = xyes -o "x$XWIN" = xyes ])
+
# Support for objc in autotools is minimal and not documented.
OBJC='$(CC)'
OBJCLD='$(CCLD)'
commit 61cb6c9aa95aa369573c4e02c023bbc33c7678c9
Author: Keith Packard <keithp at keithp.com>
Date: Wed Jan 22 19:16:36 2014 -0800
pseudoramiX: Add _X_ATTRIBUTE_PRINTF attributes to debug functions.
Signed-off-by: Keith Packard <keithp at keithp.com>
Reviewed-by: Eric Anholt <eric at anholt.net>
diff --git a/pseudoramiX/pseudoramiX.c b/pseudoramiX/pseudoramiX.c
index 23dbc73..f47c783 100644
--- a/pseudoramiX/pseudoramiX.c
+++ b/pseudoramiX/pseudoramiX.c
@@ -100,6 +100,10 @@ static unsigned long pseudoramiXGeneration = 0;
static void
PseudoramiXTrace(const char *format, ...)
+ _X_ATTRIBUTE_PRINTF(1, 2);
+
+static void
+PseudoramiXTrace(const char *format, ...)
{
va_list ap;
@@ -110,6 +114,10 @@ PseudoramiXTrace(const char *format, ...)
static void
PseudoramiXDebug(const char *format, ...)
+ _X_ATTRIBUTE_PRINTF(1, 2);
+
+static void
+PseudoramiXDebug(const char *format, ...)
{
va_list ap;
commit 9e45a1a030a5e70318441f33a132269a19a43df5
Author: Keith Packard <keithp at keithp.com>
Date: Fri Nov 15 18:00:53 2013 +0900
Warning fixes in glx
Signed-off-by: Keith Packard <keithp at keithp.com>
Reviewed-by: Eric Anholt <eric at anholt.net>
diff --git a/glx/glxdri2.c b/glx/glxdri2.c
index 8c10586..5d1a45b 100644
--- a/glx/glxdri2.c
+++ b/glx/glxdri2.c
@@ -461,7 +461,7 @@ create_driver_context(__GLXDRIcontext * context,
unsigned dri_err = 0;
unsigned major_ver;
unsigned minor_ver;
- uint32_t flags;
+ uint32_t flags = 0;
int reset;
int api = __DRI_API_OPENGL;
diff --git a/glx/glxdricommon.c b/glx/glxdricommon.c
index fc90272..69d4b29 100644
--- a/glx/glxdricommon.c
+++ b/glx/glxdricommon.c
@@ -226,7 +226,7 @@ glxConvertConfigs(const __DRIcoreExtension * core,
}
for (i = 0; configs[i]; i++) {
- int renderType = 0;
+ unsigned int renderType = 0;
if (core->getConfigAttrib(configs[i], __DRI_ATTRIB_RENDER_TYPE,
&renderType)) {
if (render_type_is_pbuffer_only(renderType) &&
More information about the xorg-commit
mailing list