i915g: Switch from pipe_winsys to intel_winsys

	Also includes moving lots of functions from i915_batch.h
	into intel_batchbuffer.h

1 files changed, 12 insertions, 8 deletions

diff --git a/src/gallium/drivers/i915simple/i915_context.h b/src/gallium/drivers/i915simple/i915_context.h
index 76aec4cd93c..234b441ce6e 100644
--- a/src/gallium/drivers/i915simple/i915_context.h
+++ b/src/gallium/drivers/i915simple/i915_context.h
@@ -38,6 +38,11 @@
 #include "tgsi/tgsi_scan.h"
 
 
+struct intel_winsys;
+struct intel_buffer;
+struct intel_batchbuffer;
+
+
 #define I915_TEX_UNITS 8
 
 #define I915_DYNAMIC_MODES4       0
@@ -182,7 +187,6 @@ struct i915_sampler_state {
    unsigned maxlod;
 };
 
-
 struct i915_texture {
    struct pipe_texture base;
 
@@ -192,7 +196,8 @@ struct i915_texture {
    unsigned depth_stride;          /* per-image on i945? */
    unsigned total_nblocksy;
 
-   unsigned tiled;
+   unsigned sw_tiled; /**< tiled with software flags */
+   unsigned hw_tiled; /**< tiled with hardware fences */
 
    unsigned nr_images[PIPE_MAX_TEXTURE_LEVELS];
 
@@ -206,16 +211,15 @@ struct i915_texture {
 
    /* The data is held here:
     */
-   struct pipe_buffer *buffer;
+   struct intel_buffer *buffer;
 };
 
-struct i915_batchbuffer;
-
 struct i915_context
 {
    struct pipe_context base;
 
-   struct i915_winsys *winsys;
+   struct intel_winsys *iws;
+
    struct draw_context *draw;
 
    /* The most recent drawing state as set by the driver:
@@ -244,10 +248,10 @@ struct i915_context
    unsigned num_vertex_elements;
    unsigned num_vertex_buffers;
 
-   struct i915_batchbuffer *batch;
+   struct intel_batchbuffer *batch;
 
    /** Vertex buffer */
-   struct pipe_buffer *vbo;
+   struct intel_buffer *vbo;
    size_t vbo_offset;
    unsigned vbo_flushed;