summaryrefslogtreecommitdiff
path: root/xvmc/intel_batchbuffer.h
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2013-11-11 14:56:22 +0000
committerChris Wilson <chris@chris-wilson.co.uk>2013-11-11 15:05:56 +0000
commitc489934ed732ed3d5a906939381c62a6bc1c38d5 (patch)
tree7d96475036f22ccad0bc43ad98ad7f71449f4ecb /xvmc/intel_batchbuffer.h
parent3e93449b5492a4fc09401c23f8754655b63959b5 (diff)
xvmc: Handle allocation failure around batch submission
If we fail to allocate a new batch, just stall and reuse the old one rather than crashing. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'xvmc/intel_batchbuffer.h')
-rw-r--r--xvmc/intel_batchbuffer.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/xvmc/intel_batchbuffer.h b/xvmc/intel_batchbuffer.h
index 7fae6f7d..c63ee5ef 100644
--- a/xvmc/intel_batchbuffer.h
+++ b/xvmc/intel_batchbuffer.h
@@ -11,8 +11,6 @@ extern int VERBOSE;
#define BEGIN_BATCH(n) \
do { \
assert(xvmc_driver->batch.space >= (n) *4); \
- if (xvmc_driver->batch.space < (n)*4) \
- intelFlushBatch(TRUE); \
batch_ptr = xvmc_driver->batch.ptr; \
} while (0)
@@ -46,7 +44,7 @@ extern int VERBOSE;
xvmc_driver->batch.ptr = batch_ptr; \
} while(0)
-extern void intelFlushBatch(Bool);
+extern void intelFlushBatch(void);
extern void intelBatchbufferData(const void *, unsigned, unsigned);
extern Bool intelInitBatchBuffer(void);
extern void intelFiniBatchBuffer(void);