Mesa (master): i965: Use info->textures_used instead of prog->SamplersUsed.
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Tue Feb 12 06:21:31 UTC 2019
Module: Mesa
Branch: master
Commit: 3eedc8f7b144c6bc21301a551763a53884c60fa1
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=3eedc8f7b144c6bc21301a551763a53884c60fa1
Author: Kenneth Graunke <kenneth at whitecape.org>
Date: Sun Feb 10 19:53:40 2019 -0800
i965: Use info->textures_used instead of prog->SamplersUsed.
prog->SamplersUsed is set by the linker when validating resource limits,
while info->textures_used is gathered after NIR optimizations, which may
have eliminated some unused surfaces.
This may let us skip some work.
Reviewed-by: Eric Anholt <eric at anholt.net>
---
src/mesa/drivers/dri/i965/brw_draw.c | 10 +++++-----
src/mesa/drivers/dri/i965/brw_wm_surface_state.c | 4 ++--
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/mesa/drivers/dri/i965/brw_draw.c b/src/mesa/drivers/dri/i965/brw_draw.c
index c3102e3fef..40bcf82ae8 100644
--- a/src/mesa/drivers/dri/i965/brw_draw.c
+++ b/src/mesa/drivers/dri/i965/brw_draw.c
@@ -815,15 +815,15 @@ brw_prepare_drawing(struct gl_context *ctx,
* index.
*/
brw->wm.base.sampler_count =
- util_last_bit(ctx->FragmentProgram._Current->SamplersUsed);
+ util_last_bit(ctx->FragmentProgram._Current->info.textures_used);
brw->gs.base.sampler_count = ctx->GeometryProgram._Current ?
- util_last_bit(ctx->GeometryProgram._Current->SamplersUsed) : 0;
+ util_last_bit(ctx->GeometryProgram._Current->info.textures_used) : 0;
brw->tes.base.sampler_count = ctx->TessEvalProgram._Current ?
- util_last_bit(ctx->TessEvalProgram._Current->SamplersUsed) : 0;
+ util_last_bit(ctx->TessEvalProgram._Current->info.textures_used) : 0;
brw->tcs.base.sampler_count = ctx->TessCtrlProgram._Current ?
- util_last_bit(ctx->TessCtrlProgram._Current->SamplersUsed) : 0;
+ util_last_bit(ctx->TessCtrlProgram._Current->info.textures_used) : 0;
brw->vs.base.sampler_count =
- util_last_bit(ctx->VertexProgram._Current->SamplersUsed);
+ util_last_bit(ctx->VertexProgram._Current->info.textures_used);
intel_prepare_render(brw);
diff --git a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
index b067a17405..ece3197a85 100644
--- a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
+++ b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
@@ -1171,11 +1171,11 @@ update_stage_texture_surfaces(struct brw_context *brw,
else
surf_offset += stage_state->prog_data->binding_table.plane_start[plane];
- unsigned num_samplers = util_last_bit(prog->SamplersUsed);
+ unsigned num_samplers = util_last_bit(prog->info.textures_used);
for (unsigned s = 0; s < num_samplers; s++) {
surf_offset[s] = 0;
- if (prog->SamplersUsed & (1 << s)) {
+ if (prog->info.textures_used & (1 << s)) {
const unsigned unit = prog->SamplerUnits[s];
const bool used_by_txf = prog->info.textures_used_by_txf & (1 << s);
struct gl_texture_object *obj = ctx->Texture.Unit[unit]._Current;
More information about the mesa-commit
mailing list