Module: Mesa
Branch: radeon-rewrite
Commit: 0bfa8dfaaf49703eb5c3237b5cae6201b8755e4d
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=0bfa8dfaaf49703eb5c3237b5cae6201b8755e4d
Author: Tormod Volden <debian.tor...@gmail.com>
Date: Tue May 12 09:32:11 2009 +0200
radeon: avoid segfault in radeon_update_renderbuffers() if using DRI1
Basically the same as 43d9020ff1e975e7f4f9480d9ef24f0b9fb2141f for intel. Bug
21688.
Signed-off-by: Tormod Volden <debian.tor...@gmail.com>
---
.../drivers/dri/radeon/radeon_common_context.c | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/mesa/drivers/dri/radeon/radeon_common_context.c
b/src/mesa/drivers/dri/radeon/radeon_common_context.c
index 124b587..6fb6f92 100644
--- a/src/mesa/drivers/dri/radeon/radeon_common_context.c
+++ b/src/mesa/drivers/dri/radeon/radeon_common_context.c
@@ -428,7 +428,7 @@ void
radeon_update_renderbuffers(__DRIcontext *context, __DRIdrawable *drawable)
{
unsigned int attachments[10];
- __DRIbuffer *buffers;
+ __DRIbuffer *buffers = NULL;
__DRIscreen *screen;
struct radeon_renderbuffer *rb;
int i, count;
@@ -444,7 +444,8 @@ radeon_update_renderbuffers(__DRIcontext *context,
__DRIdrawable *drawable)
screen = context->driScreenPriv;
radeon = (radeonContextPtr) context->driverPrivate;
- if ((screen->dri2.loader->base.version > 2)
+ if (screen->dri2.loader
+ && (screen->dri2.loader->base.version > 2)
&& (screen->dri2.loader->getBuffersWithFormat != NULL)) {
struct radeon_renderbuffer *depth_rb;
struct radeon_renderbuffer *stencil_rb;
@@ -481,7 +482,7 @@ radeon_update_renderbuffers(__DRIcontext *context,
__DRIdrawable *drawable)
attachments, i
/ 2,
&count,
drawable->loaderPrivate);
- } else {
+ } else if (screen->dri2.loader) {
i = 0;
if (draw->color_rb[0])
attachments[i++] = __DRI_BUFFER_FRONT_LEFT;
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
