Mesa: remove broken patch, this fixes #774, this fixes #857

Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue 2012-06-28 20:44:15 +02:00
parent 1cc668e4a5
commit a86b101a81

View File

@ -1,72 +0,0 @@
diff -Naur Mesa-8.0.3-old/src/mesa/drivers/dri/i915/intel_screen.c Mesa-8.0.3-new/src/mesa/drivers/dri/i915/intel_screen.c
--- Mesa-8.0.3-old/src/mesa/drivers/dri/i915/intel_screen.c 2012-03-22 10:10:16.000000000 -0700
+++ Mesa-8.0.3-new/src/mesa/drivers/dri/i915/intel_screen.c 2012-05-19 02:15:17.000000000 -0700
@@ -118,13 +118,15 @@
if (intel == NULL)
return;
- if (intel->gen < 4)
- INTEL_FIREVERTICES(intel);
+ if (intel != NULL) {
+ if (intel->gen < 4)
+ INTEL_FIREVERTICES(intel);
- intel->need_throttle = true;
+ intel->need_throttle = true;
- if (intel->batch.used)
- intel_batchbuffer_flush(intel);
+ if (intel->batch.used)
+ intel_batchbuffer_flush(intel);
+ }
}
static const struct __DRI2flushExtensionRec intelFlushExtension = {
diff -Naur Mesa-8.0.3-old/src/mesa/drivers/dri/i965/intel_screen.c Mesa-8.0.3-new/src/mesa/drivers/dri/i965/intel_screen.c
--- Mesa-8.0.3-old/src/mesa/drivers/dri/i965/intel_screen.c 2012-03-22 10:10:16.000000000 -0700
+++ Mesa-8.0.3-new/src/mesa/drivers/dri/i965/intel_screen.c 2012-05-19 02:15:17.000000000 -0700
@@ -118,13 +118,15 @@
if (intel == NULL)
return;
- if (intel->gen < 4)
- INTEL_FIREVERTICES(intel);
+ if (intel != NULL) {
+ if (intel->gen < 4)
+ INTEL_FIREVERTICES(intel);
- intel->need_throttle = true;
+ intel->need_throttle = true;
- if (intel->batch.used)
- intel_batchbuffer_flush(intel);
+ if (intel->batch.used)
+ intel_batchbuffer_flush(intel);
+ }
}
static const struct __DRI2flushExtensionRec intelFlushExtension = {
diff -Naur Mesa-8.0.3-old/src/mesa/drivers/dri/intel/intel_screen.c Mesa-8.0.3-new/src/mesa/drivers/dri/intel/intel_screen.c
--- Mesa-8.0.3-old/src/mesa/drivers/dri/intel/intel_screen.c 2012-03-22 10:10:16.000000000 -0700
+++ Mesa-8.0.3-new/src/mesa/drivers/dri/intel/intel_screen.c 2012-05-19 02:15:17.000000000 -0700
@@ -118,13 +118,15 @@
if (intel == NULL)
return;
- if (intel->gen < 4)
- INTEL_FIREVERTICES(intel);
+ if (intel != NULL) {
+ if (intel->gen < 4)
+ INTEL_FIREVERTICES(intel);
- intel->need_throttle = true;
+ intel->need_throttle = true;
- if (intel->batch.used)
- intel_batchbuffer_flush(intel);
+ if (intel->batch.used)
+ intel_batchbuffer_flush(intel);
+ }
}
static const struct __DRI2flushExtensionRec intelFlushExtension = {