i915g: Rename pipe field on context to base

6 files changed, 55 insertions, 54 deletions

diff --git a/src/gallium/drivers/i915simple/i915_context.c b/src/gallium/drivers/i915simple/i915_context.c
index bf69c8e9f5..132ed31f38 100644
--- a/src/gallium/drivers/i915simple/i915_context.c
+++ b/src/gallium/drivers/i915simple/i915_context.c
@@ -179,20 +179,20 @@ struct pipe_context *i915_create_context( struct pipe_screen *screen,
       return NULL;
 
    i915->winsys = i915_winsys;
-   i915->pipe.winsys = pipe_winsys;
-   i915->pipe.screen = screen;
+   i915->base.winsys = pipe_winsys;
+   i915->base.screen = screen;
 
-   i915->pipe.destroy = i915_destroy;
+   i915->base.destroy = i915_destroy;
 
-   i915->pipe.clear = i915_clear;
+   i915->base.clear = i915_clear;
 
 
-   i915->pipe.draw_arrays = i915_draw_arrays;
-   i915->pipe.draw_elements = i915_draw_elements;
-   i915->pipe.draw_range_elements = i915_draw_range_elements;
+   i915->base.draw_arrays = i915_draw_arrays;
+   i915->base.draw_elements = i915_draw_elements;
+   i915->base.draw_range_elements = i915_draw_range_elements;
 
-   i915->pipe.is_texture_referenced = i915_is_texture_referenced;
-   i915->pipe.is_buffer_referenced = i915_is_buffer_referenced;
+   i915->base.is_texture_referenced = i915_is_texture_referenced;
+   i915->base.is_buffer_referenced = i915_is_buffer_referenced;
 
    /*
     * Create drawing context and plug our rendering stage into it.
@@ -211,8 +211,8 @@ struct pipe_context *i915_create_context( struct pipe_screen *screen,
    i915_init_flush_functions(i915);
    i915_init_texture_functions(i915);
 
-   draw_install_aaline_stage(i915->draw, &i915->pipe);
-   draw_install_aapoint_stage(i915->draw, &i915->pipe);
+   draw_install_aaline_stage(i915->draw, &i915->base);
+   draw_install_aapoint_stage(i915->draw, &i915->base);
 
    i915->dirty = ~0;
    i915->hardware_dirty = ~0;
@@ -222,6 +222,6 @@ struct pipe_context *i915_create_context( struct pipe_screen *screen,
    i915->batch = i915_winsys->batch_get(i915_winsys);
    i915->batch->winsys = i915_winsys;
 
-   return &i915->pipe;
+   return &i915->base;
 }
 
diff --git a/src/gallium/drivers/i915simple/i915_context.h b/src/gallium/drivers/i915simple/i915_context.h
index b6983ba86e..76aec4cd93 100644
--- a/src/gallium/drivers/i915simple/i915_context.h
+++ b/src/gallium/drivers/i915simple/i915_context.h
@@ -213,7 +213,8 @@ struct i915_batchbuffer;
 
 struct i915_context
 {
-   struct pipe_context pipe;
+   struct pipe_context base;
+
    struct i915_winsys *winsys;
    struct draw_context *draw;
 
diff --git a/src/gallium/drivers/i915simple/i915_flush.c b/src/gallium/drivers/i915simple/i915_flush.c
index 472e0ab774..b223dadab6 100644
--- a/src/gallium/drivers/i915simple/i915_flush.c
+++ b/src/gallium/drivers/i915simple/i915_flush.c
@@ -74,5 +74,5 @@ static void i915_flush( struct pipe_context *pipe,
 
 void i915_init_flush_functions( struct i915_context *i915 )
 {
-   i915->pipe.flush = i915_flush;
+   i915->base.flush = i915_flush;
 }
diff --git a/src/gallium/drivers/i915simple/i915_prim_vbuf.c b/src/gallium/drivers/i915simple/i915_prim_vbuf.c
index 9bdd91f288..3ab09b58d7 100644
--- a/src/gallium/drivers/i915simple/i915_prim_vbuf.c
+++ b/src/gallium/drivers/i915simple/i915_prim_vbuf.c
@@ -116,7 +116,7 @@ i915_vbuf_render_allocate_vertices( struct vbuf_render *render,
 {
    struct i915_vbuf_render *i915_render = i915_vbuf_render(render);
    struct i915_context *i915 = i915_render->i915;
-   struct pipe_screen *screen = i915->pipe.screen;
+   struct pipe_screen *screen = i915->base.screen;
    size_t size = (size_t)vertex_size * (size_t)nr_vertices;
 
    /* FIXME: handle failure */
@@ -155,7 +155,7 @@ i915_vbuf_render_map_vertices( struct vbuf_render *render )
 {
    struct i915_vbuf_render *i915_render = i915_vbuf_render(render);
    struct i915_context *i915 = i915_render->i915;
-   struct pipe_screen *screen = i915->pipe.screen;
+   struct pipe_screen *screen = i915->base.screen;
 
    if (i915->vbo_flushed)
       debug_printf("%s bad vbo flush occured stalling on hw\n");
@@ -174,7 +174,7 @@ i915_vbuf_render_unmap_vertices( struct vbuf_render *render,
 {
    struct i915_vbuf_render *i915_render = i915_vbuf_render(render);
    struct i915_context *i915 = i915_render->i915;
-   struct pipe_screen *screen = i915->pipe.screen;
+   struct pipe_screen *screen = i915->base.screen;
 
    i915_render->vbo_max_used = MAX2(i915_render->vbo_max_used, i915_render->vertex_size * (max_index + 1));
    pipe_buffer_unmap(screen, i915_render->vbo);
@@ -515,7 +515,7 @@ static struct vbuf_render *
 i915_vbuf_render_create( struct i915_context *i915 )
 {
    struct i915_vbuf_render *i915_render = CALLOC_STRUCT(i915_vbuf_render);
-   struct pipe_screen *screen = i915->pipe.screen;
+   struct pipe_screen *screen = i915->base.screen;
 
    i915_render->i915 = i915;
    
diff --git a/src/gallium/drivers/i915simple/i915_state.c b/src/gallium/drivers/i915simple/i915_state.c
index 273e74002a..272c1b1338 100644
--- a/src/gallium/drivers/i915simple/i915_state.c
+++ b/src/gallium/drivers/i915simple/i915_state.c
@@ -751,38 +751,38 @@ static void i915_set_edgeflags(struct pipe_context *pipe,
 void
 i915_init_state_functions( struct i915_context *i915 )
 {
-   i915->pipe.set_edgeflags = i915_set_edgeflags;
-   i915->pipe.create_blend_state = i915_create_blend_state;
-   i915->pipe.bind_blend_state = i915_bind_blend_state;
-   i915->pipe.delete_blend_state = i915_delete_blend_state;
-
-   i915->pipe.create_sampler_state = i915_create_sampler_state;
-   i915->pipe.bind_sampler_states = i915_bind_sampler_states;
-   i915->pipe.delete_sampler_state = i915_delete_sampler_state;
-
-   i915->pipe.create_depth_stencil_alpha_state = i915_create_depth_stencil_state;
-   i915->pipe.bind_depth_stencil_alpha_state = i915_bind_depth_stencil_state;
-   i915->pipe.delete_depth_stencil_alpha_state = i915_delete_depth_stencil_state;
-
-   i915->pipe.create_rasterizer_state = i915_create_rasterizer_state;
-   i915->pipe.bind_rasterizer_state = i915_bind_rasterizer_state;
-   i915->pipe.delete_rasterizer_state = i915_delete_rasterizer_state;
-   i915->pipe.create_fs_state = i915_create_fs_state;
-   i915->pipe.bind_fs_state = i915_bind_fs_state;
-   i915->pipe.delete_fs_state = i915_delete_fs_state;
-   i915->pipe.create_vs_state = i915_create_vs_state;
-   i915->pipe.bind_vs_state = i915_bind_vs_state;
-   i915->pipe.delete_vs_state = i915_delete_vs_state;
-
-   i915->pipe.set_blend_color = i915_set_blend_color;
-   i915->pipe.set_clip_state = i915_set_clip_state;
-   i915->pipe.set_constant_buffer = i915_set_constant_buffer;
-   i915->pipe.set_framebuffer_state = i915_set_framebuffer_state;
-
-   i915->pipe.set_polygon_stipple = i915_set_polygon_stipple;
-   i915->pipe.set_scissor_state = i915_set_scissor_state;
-   i915->pipe.set_sampler_textures = i915_set_sampler_textures;
-   i915->pipe.set_viewport_state = i915_set_viewport_state;
-   i915->pipe.set_vertex_buffers = i915_set_vertex_buffers;
-   i915->pipe.set_vertex_elements = i915_set_vertex_elements;
+   i915->base.set_edgeflags = i915_set_edgeflags;
+   i915->base.create_blend_state = i915_create_blend_state;
+   i915->base.bind_blend_state = i915_bind_blend_state;
+   i915->base.delete_blend_state = i915_delete_blend_state;
+
+   i915->base.create_sampler_state = i915_create_sampler_state;
+   i915->base.bind_sampler_states = i915_bind_sampler_states;
+   i915->base.delete_sampler_state = i915_delete_sampler_state;
+
+   i915->base.create_depth_stencil_alpha_state = i915_create_depth_stencil_state;
+   i915->base.bind_depth_stencil_alpha_state = i915_bind_depth_stencil_state;
+   i915->base.delete_depth_stencil_alpha_state = i915_delete_depth_stencil_state;
+
+   i915->base.create_rasterizer_state = i915_create_rasterizer_state;
+   i915->base.bind_rasterizer_state = i915_bind_rasterizer_state;
+   i915->base.delete_rasterizer_state = i915_delete_rasterizer_state;
+   i915->base.create_fs_state = i915_create_fs_state;
+   i915->base.bind_fs_state = i915_bind_fs_state;
+   i915->base.delete_fs_state = i915_delete_fs_state;
+   i915->base.create_vs_state = i915_create_vs_state;
+   i915->base.bind_vs_state = i915_bind_vs_state;
+   i915->base.delete_vs_state = i915_delete_vs_state;
+
+   i915->base.set_blend_color = i915_set_blend_color;
+   i915->base.set_clip_state = i915_set_clip_state;
+   i915->base.set_constant_buffer = i915_set_constant_buffer;
+   i915->base.set_framebuffer_state = i915_set_framebuffer_state;
+
+   i915->base.set_polygon_stipple = i915_set_polygon_stipple;
+   i915->base.set_scissor_state = i915_set_scissor_state;
+   i915->base.set_sampler_textures = i915_set_sampler_textures;
+   i915->base.set_viewport_state = i915_set_viewport_state;
+   i915->base.set_vertex_buffers = i915_set_vertex_buffers;
+   i915->base.set_vertex_elements = i915_set_vertex_elements;
 }
diff --git a/src/gallium/drivers/i915simple/i915_surface.c b/src/gallium/drivers/i915simple/i915_surface.c
index 09b2c499b8..ab8331f3e6 100644
--- a/src/gallium/drivers/i915simple/i915_surface.c
+++ b/src/gallium/drivers/i915simple/i915_surface.c
@@ -89,6 +89,6 @@ i915_surface_fill(struct pipe_context *pipe,
 void
 i915_init_surface_functions(struct i915_context *i915)
 {
-   i915->pipe.surface_copy = i915_surface_copy;
-   i915->pipe.surface_fill = i915_surface_fill;
+   i915->base.surface_copy = i915_surface_copy;
+   i915->base.surface_fill = i915_surface_fill;
 }