Mesa (master): st/dri: Fix some warnings
Jakob Bornecrantz
wallbraker at kemper.freedesktop.org
Fri Aug 28 11:59:29 UTC 2009
Module: Mesa
Branch: master
Commit: b26aee0ffed3f3baee9d65365812e40598a26138
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=b26aee0ffed3f3baee9d65365812e40598a26138
Author: Jakob Bornecrantz <jakob at vmware.com>
Date: Thu Aug 27 17:38:33 2009 +0100
st/dri: Fix some warnings
---
src/gallium/state_trackers/dri/dri_context.c | 2 --
src/gallium/state_trackers/dri/dri_drawable.c | 2 ++
src/gallium/state_trackers/dri/dri_drawable.h | 1 +
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/gallium/state_trackers/dri/dri_context.c b/src/gallium/state_trackers/dri/dri_context.c
index 830e511..8819936 100644
--- a/src/gallium/state_trackers/dri/dri_context.c
+++ b/src/gallium/state_trackers/dri/dri_context.c
@@ -100,7 +100,6 @@ void
dri_destroy_context(__DRIcontextPrivate * cPriv)
{
struct dri_context *ctx = dri_context(cPriv);
- struct dri_screen *screen = dri_screen(cPriv->driScreenPriv);
/* No particular reason to wait for command completion before
* destroying a context, but it is probably worthwhile flushing it
@@ -140,7 +139,6 @@ dri_make_current(__DRIcontextPrivate * cPriv,
{
if (cPriv) {
struct dri_context *ctx = dri_context(cPriv);
- struct dri_screen *screen = dri_screen(cPriv->driScreenPriv);
struct dri_drawable *draw = dri_drawable(driDrawPriv);
struct dri_drawable *read = dri_drawable(driReadPriv);
struct st_context *old_st = st_get_current();
diff --git a/src/gallium/state_trackers/dri/dri_drawable.c b/src/gallium/state_trackers/dri/dri_drawable.c
index 200b4bd..2265187 100644
--- a/src/gallium/state_trackers/dri/dri_drawable.c
+++ b/src/gallium/state_trackers/dri/dri_drawable.c
@@ -281,6 +281,8 @@ dri_flush_frontbuffer(struct pipe_screen *screen,
/* TODO if rendering to pixmaps is slow enable this code. */
if (drawable->is_pixmap)
return;
+#else
+ (void)drawable;
#endif
(*dri_screen->dri2.loader->flushFrontBuffer)(dri_drawable,
diff --git a/src/gallium/state_trackers/dri/dri_drawable.h b/src/gallium/state_trackers/dri/dri_drawable.h
index eaf0b95..9f9cb29 100644
--- a/src/gallium/state_trackers/dri/dri_drawable.h
+++ b/src/gallium/state_trackers/dri/dri_drawable.h
@@ -33,6 +33,7 @@
struct pipe_surface;
struct pipe_fence_handle;
struct st_framebuffer;
+struct dri_context;
#define DRI_SWAP_FENCES_MAX 8
#define DRI_SWAP_FENCES_MASK 7
More information about the mesa-commit
mailing list