Module: Mesa Branch: master Commit: 324368b500fc83fc8aa801ac2ab4db4427ebece1 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=324368b500fc83fc8aa801ac2ab4db4427ebece1
Author: Kenneth Graunke <[email protected]> Date: Mon Nov 24 22:20:29 2014 -0800 i965: Move some /* CACHE_NEW_SAMPLER */ comments. Marking brw_stage_state::sampler_count as CACHE_NEW_SAMPLER is wrong. The number of samplers used by each program is actually computed at draw time (brw_try_draw_prims), based purely on the currently bound shader programs (gl_program::SamplersUsed). CACHE_NEW_SAMPLER means that we've emitted a new SAMPLER_STATE table. Although this could indicate that the number of samplers has changed, it could also simply mean that the contents of the table has changed (i.e. we've bound different textures). The real reason these atoms depend on CACHE_NEW_SAMPLER is because they include a pointer to the SAMPLER_STATE table. This was not commented. So, move the comments to the appropriate place. Signed-off-by: Kenneth Graunke <[email protected]> Reviewed-by: Kristian Høgsberg <[email protected]> Reviewed-by: Matt Turner <[email protected]> --- src/mesa/drivers/dri/i965/brw_vs_state.c | 2 +- src/mesa/drivers/dri/i965/brw_wm_state.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_vs_state.c b/src/mesa/drivers/dri/i965/brw_vs_state.c index cd740db..351f7ef 100644 --- a/src/mesa/drivers/dri/i965/brw_vs_state.c +++ b/src/mesa/drivers/dri/i965/brw_vs_state.c @@ -145,7 +145,6 @@ brw_upload_vs_unit(struct brw_context *brw) if (brw->gen == 5) vs->vs5.sampler_count = 0; /* hardware requirement */ else { - /* CACHE_NEW_SAMPLER */ vs->vs5.sampler_count = (stage_state->sampler_count + 3) / 4; } @@ -160,6 +159,7 @@ brw_upload_vs_unit(struct brw_context *brw) /* Set the sampler state pointer, and its reloc */ if (stage_state->sampler_count) { + /* CACHE_NEW_SAMPLER - reloc */ vs->vs5.sampler_state_pointer = (brw->batch.bo->offset64 + stage_state->sampler_offset) >> 5; drm_intel_bo_emit_reloc(brw->batch.bo, diff --git a/src/mesa/drivers/dri/i965/brw_wm_state.c b/src/mesa/drivers/dri/i965/brw_wm_state.c index 6a53a98..2f315c6 100644 --- a/src/mesa/drivers/dri/i965/brw_wm_state.c +++ b/src/mesa/drivers/dri/i965/brw_wm_state.c @@ -150,12 +150,11 @@ brw_upload_wm_unit(struct brw_context *brw) if (brw->gen == 5) wm->wm4.sampler_count = 0; /* hardware requirement */ else { - /* CACHE_NEW_SAMPLER */ wm->wm4.sampler_count = (brw->wm.base.sampler_count + 1) / 4; } if (brw->wm.base.sampler_count) { - /* reloc */ + /* CACHE_NEW_SAMPLER - reloc */ wm->wm4.sampler_state_pointer = (brw->batch.bo->offset64 + brw->wm.base.sampler_offset) >> 5; } else { _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
