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

i965/state: Rename brw_upload_state to brw_upload_render_state

Browse Source 
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Jordan Justen
2015-03-07 20:20:03 -08:00
parent 611bd80f3b
commit 2c02baa487
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mesa/drivers/dri/i965/brw_draw.c
+4 -3
View File
@@ -430,8 +430,9 @@ static void brw_try_draw_prims( struct gl_context *ctx,
intel_prepare_render(brw);
/* This workaround has to happen outside of brw_upload_state() because it
* may flush the batchbuffer for a blit, affecting the state flags.
/* This workaround has to happen outside of brw_upload_render_state()
* because it may flush the batchbuffer for a blit, affecting the state
* flags.
*/
brw_workaround_depthstencil_alignment(brw, 0);
@@ -508,7 +509,7 @@ retry:
*/
if (brw->state.dirty.brw) {
brw->no_batch_wrap = true;
brw_upload_state(brw);
brw_upload_render_state(brw);
}
brw_emit_prim(brw, &prims[i], brw->primitive);
src/mesa/drivers/dri/i965/brw_state.h
+1 -1
View File
@@ -168,7 +168,7 @@ brw_depthbuffer_format(struct brw_context *brw);
/***********************************************************************
* brw_state.c
*/
void brw_upload_state(struct brw_context *brw);
void brw_upload_render_state(struct brw_context *brw);
void brw_clear_dirty_bits(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
+6 -6
View File
@@ -579,7 +579,7 @@ brw_upload_programs(struct brw_context *brw)
/***********************************************************************
* Emit all state:
*/
void brw_upload_state(struct brw_context *brw)
void brw_upload_render_state(struct brw_context *brw)
{
struct gl_context *ctx = &brw->ctx;
struct brw_state_flags *state = &brw->state.dirty;
@@ -686,11 +686,11 @@ void brw_upload_state(struct brw_context *brw)
/**
* Clear dirty bits to account for the fact that the state emitted by
* brw_upload_state() has been committed to the hardware. This is a separate
* call from brw_upload_state() because it's possible that after the call to
* brw_upload_state(), we will discover that we've run out of aperture space,
* and need to rewind the batch buffer to the state it had before the
* brw_upload_state() call.
* brw_upload_render_state() has been committed to the hardware. This is a
* separate call from brw_upload_render_state() because it's possible that
* after the call to brw_upload_render_state(), we will discover that we've
* run out of aperture space, and need to rewind the batch buffer to the state
* it had before the brw_upload_render_state() call.
*/
void
brw_clear_dirty_bits(struct brw_context *brw)