Merge remote branch 'origin/gallium-st-api-dri'

[mesa.git] / src / mesa / drivers / dri / i915 / i915_context.h

diff --git a/src/mesa/drivers/dri/i915/i915_context.h b/src/mesa/drivers/dri/i915/i915_context.h
index f55b55113983768b6316ea524f5b2fdafad98a2e..b5169280f6b14cd585cb71288f63e5895a09a67f 100644 (file)
--- a/src/mesa/drivers/dri/i915/i915_context.h
+++ b/src/mesa/drivers/dri/i915/i915_context.h
@@ -40,6 +40,7 @@
 #define I915_FALLBACK_POLYGON_SMOOTH    0x40000
 #define I915_FALLBACK_POINT_SMOOTH      0x80000
 #define I915_FALLBACK_POINT_SPRITE_COORD_ORIGIN         0x100000
+#define I915_FALLBACK_DRAW_OFFSET       0x200000
 
 #define I915_UPLOAD_CTX              0x1
 #define I915_UPLOAD_BUFFERS          0x2
@@ -259,7 +260,7 @@ struct i915_context
 
    struct i915_fragment_program *current_program;
 
-   struct i915_hw_state meta, initial, state, *current;
+   struct i915_hw_state state;
 };
 
 
@@ -345,12 +346,6 @@ extern void i915_update_provoking_vertex(GLcontext *ctx);
 extern void i915UpdateTextureState(struct intel_context *intel);
 extern void i915InitTextureFuncs(struct dd_function_table *functions);
 
-/*======================================================================
- * i915_metaops.c
- */
-void i915InitMetaFuncs(struct i915_context *i915);
-
-
 /*======================================================================
  * i915_fragprog.c
  */