summaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers/dri
diff options
context:
space:
mode:
authorBrian <[email protected]>2007-11-05 09:02:54 -0700
committerBrian <[email protected]>2007-11-05 09:02:54 -0700
commitbac76b71f1fed705fb5ee68bec88b82ad74de920 (patch)
tree382281673c8e8d30dd4936a82f673a9bd10acb64 /src/mesa/drivers/dri
parent1cb81470b78f22708e9b83a40acb470744575ff3 (diff)
remove intel_context cliprect code
Diffstat (limited to 'src/mesa/drivers/dri')
-rw-r--r--src/mesa/drivers/dri/intel_winsys/intel_context.h5
-rw-r--r--src/mesa/drivers/dri/intel_winsys/intel_lock.c33
2 files changed, 1 insertions, 37 deletions
diff --git a/src/mesa/drivers/dri/intel_winsys/intel_context.h b/src/mesa/drivers/dri/intel_winsys/intel_context.h
index 03c7fd26309..3a61a5610fb 100644
--- a/src/mesa/drivers/dri/intel_winsys/intel_context.h
+++ b/src/mesa/drivers/dri/intel_winsys/intel_context.h
@@ -59,11 +59,6 @@ struct intel_context
char *prevLockFile;
int prevLockLine;
- /* These refer to the current drawing buffer:
- */
- GLuint numClipRects; /**< cliprects for drawing */
- drm_clip_rect_t *pClipRects;
-
GLuint irqsEmitted;
drm_i915_irq_wait_t iw;
diff --git a/src/mesa/drivers/dri/intel_winsys/intel_lock.c b/src/mesa/drivers/dri/intel_winsys/intel_lock.c
index af9b53a52b3..eee1ccc6ea0 100644
--- a/src/mesa/drivers/dri/intel_winsys/intel_lock.c
+++ b/src/mesa/drivers/dri/intel_winsys/intel_lock.c
@@ -65,40 +65,9 @@ intelContendedLock(struct intel_context *intel, GLuint flags)
intelUpdateScreenRotation(sPriv, sarea);
}
-
-#if 0
- if (sarea->width != intel->width ||
- sarea->height != intel->height ||
- sarea->rotation != intel->current_rotation) {
- int numClipRects = intel->numClipRects;
-
- /*
- * FIXME: Really only need to do this when drawing to a
- * common back- or front buffer.
- */
-
- /*
- * This will essentially drop the outstanding batchbuffer on the floor.
- */
- intel->numClipRects = 0;
-
- st_flush(intel->st);
-
- if (intel->batch->map != intel->batch->ptr)
- intel_batchbuffer_flush(intel->batch);
-
- intel->numClipRects = numClipRects;
-
- /* force window update */
- intel->lastStamp = 0;
-
- intel->width = sarea->width;
- intel->height = sarea->height;
- intel->current_rotation = sarea->rotation;
- }
-#endif
}
+
/* Lock the hardware and validate our state.
*/
void LOCK_HARDWARE( struct intel_context *intel )