AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

i965: Merge brw_validate_state() and brw_upload_state() together.

Browse Source 
They were called back-to-back at this point.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Acked-by: Paul Berry <stereotype441@gmail.com>
This commit is contained in:
Eric Anholt
2011-10-22 12:11:27 -07:00
parent 68c813e8ea
commit 35c7e8cebe
3 changed files with 5 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mesa/drivers/dri/i965/brw_draw.c
-7
View File
@@ -359,13 +359,6 @@ retry:
* brw->state.dirty.brw.
*/
if (brw->state.dirty.brw) {
brw_validate_state(brw);
if (brw->intel.Fallback) {
retval = false;
goto out;
}
intel->no_batch_wrap = true;
brw_upload_state(brw);
src/mesa/drivers/dri/i965/brw_state.h
-1
View File
@@ -124,7 +124,6 @@ extern const struct brw_tracked_state gen7_wm_surfaces;
/***********************************************************************
* brw_state.c
*/
void brw_validate_state(struct brw_context *brw);
void brw_upload_state(struct brw_context *brw);
void brw_init_state(struct brw_context *brw);
void brw_destroy_state(struct brw_context *brw);
src/mesa/drivers/dri/i965/brw_state_upload.c
+5 -11
View File
@@ -421,11 +421,15 @@ brw_print_dirty_count(struct dirty_bit_map *bit_map, int32_t bits)
/***********************************************************************
* Emit all state:
*/
void brw_validate_state( struct brw_context *brw )
void brw_upload_state(struct brw_context *brw)
{
struct gl_context *ctx = &brw->intel.ctx;
struct intel_context *intel = &brw->intel;
struct brw_state_flags *state = &brw->state.dirty;
const struct brw_tracked_state *atoms = brw->emit_atoms;
int num_atoms = brw->num_emit_atoms;
int i;
static int dirty_count = 0;
state->mesa |= brw->intel.NewGLState;
brw->intel.NewGLState = 0;
@@ -452,16 +456,6 @@ void brw_validate_state( struct brw_context *brw )
brw->intel.Fallback = false; /* boolean, not bitfield */
intel_check_front_buffer_rendering(intel);
}
void brw_upload_state(struct brw_context *brw)
{
struct brw_state_flags *state = &brw->state.dirty;
const struct brw_tracked_state *atoms = brw->emit_atoms;
int num_atoms = brw->num_emit_atoms;
int i;
static int dirty_count = 0;
if (unlikely(INTEL_DEBUG)) {
/* Debug version which enforces various sanity checks on the