summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJakob Bornecrantz <[email protected]>2009-08-27 17:38:33 +0100
committerJakob Bornecrantz <[email protected]>2009-08-28 12:46:17 +0200
commitb26aee0ffed3f3baee9d65365812e40598a26138 (patch)
treeff88de8c2ee259a38bc26ff415156f103b8e0649
parent6f0a1a842685a2b172187ece08113352c3765ce6 (diff)
st/dri: Fix some warnings
-rw-r--r--src/gallium/state_trackers/dri/dri_context.c2
-rw-r--r--src/gallium/state_trackers/dri/dri_drawable.c2
-rw-r--r--src/gallium/state_trackers/dri/dri_drawable.h1
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 830e511fefd..8819936fcaf 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 200b4bd3766..2265187880b 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 eaf0b954bd4..9f9cb29b974 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