fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-22 20:00:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

i965: Drop the dead tracking of color_regions[].

Browse source 
We pull the draw regions right out of the renderbuffers these days.
This commit is contained in:
Eric Anholt 2011-01-30 21:13:17 -08:00
parent 95cdce7f70
commit 1b80622c4e
3 changed files with 2 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/mesa/drivers/dri/i965/brw_context.h
View file

@ -461,8 +461,6 @@ struct brw_context
struct { struct {
struct brw_state_flags dirty; struct brw_state_flags dirty;
GLuint nr_color_regions;
struct intel_region *color_regions[MAX_DRAW_BUFFERS];
struct intel_region *depth_region; struct intel_region *depth_region;
/** /**

9
src/mesa/drivers/dri/i965/brw_vtbl.c
View file

@ -73,9 +73,6 @@ static void brw_destroy_context( struct intel_context *intel )
free(brw->wm.compile_data); free(brw->wm.compile_data);
} }
for (i = 0; i < brw->state.nr_color_regions; i++)
intel_region_release(&brw->state.color_regions[i]);
brw->state.nr_color_regions = 0;
intel_region_release(&brw->state.depth_region); intel_region_release(&brw->state.depth_region);
dri_bo_release(&brw->curbe.curbe_bo); dri_bo_release(&brw->curbe.curbe_bo);
@ -122,20 +119,14 @@ static void brw_set_draw_region( struct intel_context *intel,
GLuint num_color_regions) GLuint num_color_regions)
{ {
struct brw_context *brw = brw_context(&intel->ctx); struct brw_context *brw = brw_context(&intel->ctx);
GLuint i;
/* release old color/depth regions */ /* release old color/depth regions */
if (brw->state.depth_region != depth_region) if (brw->state.depth_region != depth_region)
brw->state.dirty.brw |= BRW_NEW_DEPTH_BUFFER; brw->state.dirty.brw |= BRW_NEW_DEPTH_BUFFER;
for (i = 0; i < brw->state.nr_color_regions; i++)
intel_region_release(&brw->state.color_regions[i]);
intel_region_release(&brw->state.depth_region); intel_region_release(&brw->state.depth_region);
/* reference new color/depth regions */ /* reference new color/depth regions */
for (i = 0; i < num_color_regions; i++)
intel_region_reference(&brw->state.color_regions[i], color_regions[i]);
intel_region_reference(&brw->state.depth_region, depth_region); intel_region_reference(&brw->state.depth_region, depth_region);
brw->state.nr_color_regions = num_color_regions;
} }

3
src/mesa/drivers/dri/i965/brw_wm.c
View file

@ -431,7 +431,8 @@ static void brw_wm_populate_key( struct brw_context *brw,
key->render_to_fbo = ctx->DrawBuffer->Name != 0; key->render_to_fbo = ctx->DrawBuffer->Name != 0;
} }
key->nr_color_regions = brw->state.nr_color_regions; /* _NEW_BUFFERS */
key->nr_color_regions = ctx->DrawBuffer->_NumColorDrawBuffers;
/* CACHE_NEW_VS_PROG */ /* CACHE_NEW_VS_PROG */
key->vp_outputs_written = brw->vs.prog_data->outputs_written; key->vp_outputs_written = brw->vs.prog_data->outputs_written;