diff options
author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2010-06-22 20:04:23 +0000 |
---|---|---|
committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2010-06-22 20:04:23 +0000 |
commit | 7f992e582712ec939fcc2564ec6138dbaea1154d (patch) | |
tree | 26cca762969e35a78b0e7ce8460c43825fd96ff6 /dist/Mesa/src/gallium/drivers | |
parent | d2bab8f8d2852e84d5cfb626567e2d460239ee04 (diff) |
Update to Mesa 7.8.2. Tested by johan@. Thanks.
Diffstat (limited to 'dist/Mesa/src/gallium/drivers')
-rw-r--r-- | dist/Mesa/src/gallium/drivers/cell/ppu/cell_context.c | 2 | ||||
-rw-r--r-- | dist/Mesa/src/gallium/drivers/cell/ppu/cell_fence.c | 1 | ||||
-rw-r--r-- | dist/Mesa/src/gallium/drivers/cell/ppu/cell_pipe_state.c | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/dist/Mesa/src/gallium/drivers/cell/ppu/cell_context.c b/dist/Mesa/src/gallium/drivers/cell/ppu/cell_context.c index 5bff9869f..b48393511 100644 --- a/dist/Mesa/src/gallium/drivers/cell/ppu/cell_context.c +++ b/dist/Mesa/src/gallium/drivers/cell/ppu/cell_context.c @@ -74,7 +74,7 @@ cell_destroy_context( struct pipe_context *pipe ) static struct draw_context * cell_draw_create(struct cell_context *cell) { - struct draw_context *draw = draw_create(); + struct draw_context *draw = draw_create(&cell->pipe); #if 0 /* broken */ if (getenv("GALLIUM_CELL_VS")) { diff --git a/dist/Mesa/src/gallium/drivers/cell/ppu/cell_fence.c b/dist/Mesa/src/gallium/drivers/cell/ppu/cell_fence.c index e10071529..6ff19f270 100644 --- a/dist/Mesa/src/gallium/drivers/cell/ppu/cell_fence.c +++ b/dist/Mesa/src/gallium/drivers/cell/ppu/cell_fence.c @@ -92,7 +92,6 @@ cell_add_buffer_to_list(struct cell_context *cell, struct cell_buffer_list *list, struct pipe_buffer *buffer) { - struct pipe_screen *ps = cell->pipe.screen; struct cell_buffer_node *node = CALLOC_STRUCT(cell_buffer_node); /* create new list node which references the buffer, insert at head */ if (node) { diff --git a/dist/Mesa/src/gallium/drivers/cell/ppu/cell_pipe_state.c b/dist/Mesa/src/gallium/drivers/cell/ppu/cell_pipe_state.c index 3d8b4409c..74a73b418 100644 --- a/dist/Mesa/src/gallium/drivers/cell/ppu/cell_pipe_state.c +++ b/dist/Mesa/src/gallium/drivers/cell/ppu/cell_pipe_state.c @@ -197,7 +197,7 @@ cell_bind_rasterizer_state(struct pipe_context *pipe, void *rast) struct cell_context *cell = cell_context(pipe); /* pass-through to draw module */ - draw_set_rasterizer_state(cell->draw, rasterizer); + draw_set_rasterizer_state(cell->draw, rasterizer, rast); cell->rasterizer = rasterizer; |