summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichel Dänzer <michel@tungstengraphics.com>2007-05-14 15:34:03 +0200
committerMichel Dänzer <michel@tungstengraphics.com>2007-05-14 15:34:03 +0200
commit5e5f450245249d0279f4d804ecc8d5a73dc938dd (patch)
tree8f9ca22aaa72c3da9aad08ca89973338aa778e73
parent7dfcf9932959636193e9c38e69f1eed29e6db439 (diff)
i915tex: Remove some dead code.
This eliminates the last compile warnings in the driver.
-rw-r--r--src/mesa/drivers/dri/i915tex/intel_batchpool.c28
-rw-r--r--src/mesa/drivers/dri/i915tex/intel_state.c6
2 files changed, 0 insertions, 34 deletions
diff --git a/src/mesa/drivers/dri/i915tex/intel_batchpool.c b/src/mesa/drivers/dri/i915tex/intel_batchpool.c
index 62e5cc677b..2f5d48011b 100644
--- a/src/mesa/drivers/dri/i915tex/intel_batchpool.c
+++ b/src/mesa/drivers/dri/i915tex/intel_batchpool.c
@@ -362,34 +362,6 @@ pool_validate(struct _DriBufferPool *pool, void *private)
return 0;
}
-static int
-pool_validateBuffer(struct _DriBufferPool *pool, void *private, unsigned long flags,
- unsigned long mask, unsigned long hint)
-{
- BBuf *buf = (BBuf *) private;
- BPool *p = buf->parent;
- unsigned long flagChange;
- drmBO *kernelBO;
- int ret = 0;
-
- _glthread_LOCK_MUTEX(p->mutex);
- kernelBO = &p->kernelBO;
- flagChange = (flags ^ kernelBO->flags) & mask;
-
- if (flagChange & ~DRM_BO_FLAG_NO_MOVE) {
- fprintf(stderr, "Not allowed to change batchpool flags.\n");
- ret = -EINVAL;
- } else if (flagChange & DRM_BO_FLAG_NO_MOVE) {
- ret = drmBOValidate(pool->fd, kernelBO, flags, mask, hint);
- }
-
- buf->unfenced = !(hint & DRM_BO_HINT_DONT_FENCE);
- _glthread_UNLOCK_MUTEX(p->mutex);
-
- return ret;
-}
-
-
static void
pool_takedown(struct _DriBufferPool *pool)
{
diff --git a/src/mesa/drivers/dri/i915tex/intel_state.c b/src/mesa/drivers/dri/i915tex/intel_state.c
index e8f8195e80..34d331ca51 100644
--- a/src/mesa/drivers/dri/i915tex/intel_state.c
+++ b/src/mesa/drivers/dri/i915tex/intel_state.c
@@ -222,9 +222,3 @@ void intel_state_init( struct intel_context *intel )
intel->state.hardware = malloc( intel->state.driver_state_size );
memset( intel->state.hardware, 0, intel->state.driver_state_size );
}
-
-
-void intel_state_destroy( struct intel_context *intel )
-{
- free( intel->state.hardware );
-}