xserver: Branch 'master' - 7 commits
Keith Packard
keithp at kemper.freedesktop.org
Thu Jul 12 19:24:40 PDT 2012
glx/glxdri2.c | 15 ++++++++-------
hw/xfree86/common/xf86AutoConfig.c | 1 +
2 files changed, 9 insertions(+), 7 deletions(-)
New commits:
commit d5977e5bd2c8ee77db08d5f948f266c9661b9fb5
Author: Dave Airlie <airlied at gmail.com>
Date: Fri Jul 13 00:28:19 2012 +1000
xf86: include xf86platformBus.h in xf86AutoConfig.c
This fixes an implicit declaration,
xf86AutoConfig.c:202:5: error: implicit declaration of function 'xf86PlatformMatchDriver' [-Werror=implicit-function-declaration]
xf86AutoConfig.c:202:5: warning: nested extern declaration of 'xf86PlatformMatchDriver' [-Wnested-externs]
Signed-off-by: Dave Airlie <airlied at redhat.com>
Reviewed-by: Keith Packard <keithp at keithp.com>
diff --git a/hw/xfree86/common/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConfig.c
index 271ce86..95d58fe 100644
--- a/hw/xfree86/common/xf86AutoConfig.c
+++ b/hw/xfree86/common/xf86AutoConfig.c
@@ -39,6 +39,7 @@
#include "xf86Config.h"
#include "xf86Priv.h"
#include "xf86_OSlib.h"
+#include "xf86platformBus.h"
#include "xf86pciBus.h"
#ifdef __sparc__
#include "xf86sbusBus.h"
commit afa3b9ccd27ff9c58f536cb3b727e85feb6a6f6a
Author: Bartosz Brachaczek <b.brachaczek at gmail.com>
Date: Fri Jul 6 02:52:40 2012 +0200
glx: Fix checking GL version
Signed-off-by: Bartosz Brachaczek <b.brachaczek at gmail.com>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
Signed-off-by: Dave Airlie <airlied at gmail.com>
diff --git a/glx/glxdri2.c b/glx/glxdri2.c
index 4e00673..bce1bfa 100644
--- a/glx/glxdri2.c
+++ b/glx/glxdri2.c
@@ -486,7 +486,7 @@ dri2_convert_glx_attribs(__GLXDRIscreen *screen, unsigned num_attribs,
* don't support OpenGL 3.2 may fail the request for a core profile.
*/
if (*api == __DRI_API_OPENGL_CORE
- && (*major_ver < 3 || (*major_ver < 3 && *minor_ver < 2))) {
+ && (*major_ver < 3 || (*major_ver == 3 && *minor_ver < 2))) {
*api = __DRI_API_OPENGL;
}
commit 743ccf6fa0a9a4579d6de6d10e2e6040640772d9
Author: Dave Airlie <airlied at gmail.com>
Date: Thu Jul 12 19:09:15 2012 +1000
glx/dri2: don't return NULL in a function with no return.
Reported by gcc.
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Matt Turner <mattst88 at gmail.com>
Signed-off-by: Dave Airlie <airlied at redhat.com>
diff --git a/glx/glxdri2.c b/glx/glxdri2.c
index 897eb59..4e00673 100644
--- a/glx/glxdri2.c
+++ b/glx/glxdri2.c
@@ -521,7 +521,7 @@ create_driver_context(__GLXDRIcontext * context,
&major_ver, &minor_ver,
&flags, &api, &reset,
(unsigned *) error))
- return NULL;
+ return;
ctx_attribs[num_ctx_attribs++] = __DRI_CTX_ATTRIB_MAJOR_VERSION;
ctx_attribs[num_ctx_attribs++] = major_ver;
commit d1a00c26becdc2490ab4660abf108eca09c30d23
Author: Dave Airlie <airlied at gmail.com>
Date: Thu Jul 12 19:05:41 2012 +1000
glx/dri2: use correct define from dri attribs.
Looks like idr renamed this and pushed the wrong one.
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Matt Turner <mattst88 at gmail.com>
Signed-off-by: Dave Airlie <airlied at redhat.com>
diff --git a/glx/glxdri2.c b/glx/glxdri2.c
index 599d0ef..897eb59 100644
--- a/glx/glxdri2.c
+++ b/glx/glxdri2.c
@@ -540,7 +540,7 @@ create_driver_context(__GLXDRIcontext * context,
#ifdef __DRI2_ROBUSTNESS
if (reset != __DRI_CTX_RESET_NO_NOTIFICATION) {
ctx_attribs[num_ctx_attribs++] =
- __DRI_CTX_ATTRIB_RESET_NOTIFICATION;
+ __DRI_CTX_ATTRIB_RESET_STRATEGY;
ctx_attribs[num_ctx_attribs++] = reset;
}
#endif
commit c62205adcd48d497450655d0136f8ca5bd5cbae7
Author: Dave Airlie <airlied at gmail.com>
Date: Thu Jul 12 19:04:13 2012 +1000
glx/dri2: fix incorrect == vs =
glxdri2.c:486: warning: statement with no effect
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Matt Turner <mattst88 at gmail.com>
Signed-off-by: Dave Airlie <airlied at redhat.com>
diff --git a/glx/glxdri2.c b/glx/glxdri2.c
index f168d6f..599d0ef 100644
--- a/glx/glxdri2.c
+++ b/glx/glxdri2.c
@@ -487,7 +487,7 @@ dri2_convert_glx_attribs(__GLXDRIscreen *screen, unsigned num_attribs,
*/
if (*api == __DRI_API_OPENGL_CORE
&& (*major_ver < 3 || (*major_ver < 3 && *minor_ver < 2))) {
- *api == __DRI_API_OPENGL;
+ *api = __DRI_API_OPENGL;
}
*error = Success;
commit defca4c192bd7f4af2b273c7cb1fe8665888772a
Author: Dave Airlie <airlied at gmail.com>
Date: Thu Jul 12 18:52:34 2012 +1000
glx/dri2: fix typo in the notification reset for robustness.
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Matt Turner <mattst88 at gmail.com>
Signed-off-by: Dave Airlie <airlied at redhat.com>
diff --git a/glx/glxdri2.c b/glx/glxdri2.c
index f3e26b7..f168d6f 100644
--- a/glx/glxdri2.c
+++ b/glx/glxdri2.c
@@ -538,7 +538,7 @@ create_driver_context(__GLXDRIcontext * context,
}
#ifdef __DRI2_ROBUSTNESS
- if (reset != __DRI_CTX_NO_RESET_NOTIFICATION) {
+ if (reset != __DRI_CTX_RESET_NO_NOTIFICATION) {
ctx_attribs[num_ctx_attribs++] =
__DRI_CTX_ATTRIB_RESET_NOTIFICATION;
ctx_attribs[num_ctx_attribs++] = reset;
commit d1cae6bb804f7dfc889fd3c5d5eb116f4baf5149
Author: Dave Airlie <airlied at gmail.com>
Date: Thu Jul 12 18:51:52 2012 +1000
glx: pass screen into the convert function
when robustness is enabled, this is required.
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
Signed-off-by: Dave Airlie <airlied at redhat.com>
diff --git a/glx/glxdri2.c b/glx/glxdri2.c
index be5afbc..f3e26b7 100644
--- a/glx/glxdri2.c
+++ b/glx/glxdri2.c
@@ -393,7 +393,8 @@ __glXDRIscreenDestroy(__GLXscreen * baseScreen)
}
static Bool
-dri2_convert_glx_attribs(unsigned num_attribs, const uint32_t *attribs,
+dri2_convert_glx_attribs(__GLXDRIscreen *screen, unsigned num_attribs,
+ const uint32_t *attribs,
unsigned *major_ver, unsigned *minor_ver,
uint32_t *flags, int *api, int *reset, unsigned *error)
{
@@ -516,7 +517,7 @@ create_driver_context(__GLXDRIcontext * context,
int api;
if (num_attribs != 0) {
- if (!dri2_convert_glx_attribs(num_attribs, attribs,
+ if (!dri2_convert_glx_attribs(screen, num_attribs, attribs,
&major_ver, &minor_ver,
&flags, &api, &reset,
(unsigned *) error))
More information about the xorg-commit
mailing list