i965/gs: Add a case to brwNewProgram() for geometry shaders.

[mesa.git] / src / mesa / drivers / dri / i965 / intel_batchbuffer.h

diff --git a/src/mesa/drivers/dri/i965/intel_batchbuffer.h b/src/mesa/drivers/dri/i965/intel_batchbuffer.h
index 4e73f61db0db9e3ad38e55160459cf4d7e01a120..15a9ca1e24dde7765682ff3304d9986c8adf7a8f 100644 (file)
--- a/src/mesa/drivers/dri/i965/intel_batchbuffer.h
+++ b/src/mesa/drivers/dri/i965/intel_batchbuffer.h
@@ -101,8 +101,7 @@ intel_batchbuffer_emit_float(struct brw_context *brw, float f)
 static INLINE void
 intel_batchbuffer_require_space(struct brw_context *brw, GLuint sz, int is_blit)
 {
-   struct intel_context *intel = &brw->intel;
-   if (intel->gen >= 6 &&
+   if (brw->gen >= 6 &&
        brw->batch.is_blit != is_blit && brw->batch.used) {
       intel_batchbuffer_flush(brw);
    }
@@ -145,10 +144,6 @@ intel_batchbuffer_advance(struct brw_context *brw)
 
 void intel_batchbuffer_cached_advance(struct brw_context *brw);
 
-/* Here are the crusty old macros, to be removed:
- */
-#define BATCH_LOCALS
-
 #define BEGIN_BATCH(n) intel_batchbuffer_begin(brw, n, false)
 #define BEGIN_BATCH_BLT(n) intel_batchbuffer_begin(brw, n, true)
 #define OUT_BATCH(d) intel_batchbuffer_emit_dword(brw, d)