i965g: remove redundant screen pointer in brw context struct

This commit is contained in:
Keith Whitwell
2009-11-04 23:30:52 +00:00
parent e3e084c660
commit 7a49bd6d15
4 changed files with 7 additions and 6 deletions
-1
View File
@@ -483,7 +483,6 @@ struct brw_context
struct pipe_context base;
struct brw_chipset chipset;
struct brw_screen *brw_screen;
struct brw_winsys_screen *sws;
struct brw_batchbuffer *batch;
+1 -1
View File
@@ -224,7 +224,7 @@ static int prepare_curbe_buffer(struct brw_context *brw)
if (brw->curbe.vs_size) {
GLuint offset = brw->curbe.vs_start * 16;
GLuint nr = brw->curr.vertex_shader->info.file_max[TGSI_FILE_CONSTANT];
struct pipe_screen *screen = &brw->brw_screen->base;
struct pipe_screen *screen = brw->base.screen;
const GLfloat *value = screen->buffer_map( screen,
brw->curr.vertex_constants,
+2 -2
View File
@@ -258,14 +258,14 @@ boolean brw_draw_init( struct brw_context *brw )
/* Create helpers for uploading data in user buffers:
*/
brw->vb.upload_vertex = u_upload_create( &brw->brw_screen->base,
brw->vb.upload_vertex = u_upload_create( brw->base.screen,
128 * 1024,
64,
PIPE_BUFFER_USAGE_VERTEX );
if (brw->vb.upload_vertex == NULL)
return FALSE;
brw->vb.upload_index = u_upload_create( &brw->brw_screen->base,
brw->vb.upload_index = u_upload_create( brw->base.screen,
128 * 1024,
64,
PIPE_BUFFER_USAGE_INDEX );
+4 -2
View File
@@ -50,8 +50,9 @@ static unsigned brw_is_buffer_referenced(struct pipe_context *pipe,
struct pipe_buffer *buffer)
{
struct brw_context *brw = brw_context(pipe);
struct brw_screen *bscreen = brw_screen(brw->base.screen);
return brw_is_buffer_referenced_by_bo( brw->brw_screen,
return brw_is_buffer_referenced_by_bo( bscreen,
buffer,
brw->batch->buf );
}
@@ -62,8 +63,9 @@ static unsigned brw_is_texture_referenced(struct pipe_context *pipe,
unsigned level)
{
struct brw_context *brw = brw_context(pipe);
struct brw_screen *bscreen = brw_screen(brw->base.screen);
return brw_is_texture_referenced_by_bo( brw->brw_screen,
return brw_is_texture_referenced_by_bo( bscreen,
texture, face, level,
brw->batch->buf );
}