From 9ebda0a63c1e465add7e5fc9f0b97fd6fc3bd082 Mon Sep 17 00:00:00 2001 From: Axel Davy Date: Sun, 23 Apr 2023 13:49:36 +0200 Subject: [PATCH] frontend/nine: Fix num_textures count util_last_bit already included the +1 Fixes: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11865?commit_id=9205a45da50ebc6159169ba42b02d8475b09bfd7 Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/8894 cc: mesa-stable Signed-off-by: Axel Davy Reviewed-by: David Heidelberg Part-of: (cherry picked from commit ad1e64551d1ad76d8c9f8cac40deba53316d753f) --- .pick_status.json | 2 +- src/gallium/frontends/nine/nine_state.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 313c07516fe..928431a0970 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1687,7 +1687,7 @@ "description": "frontend/nine: Fix num_textures count", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null }, diff --git a/src/gallium/frontends/nine/nine_state.c b/src/gallium/frontends/nine/nine_state.c index cd627c83d1e..84e73770d87 100644 --- a/src/gallium/frontends/nine/nine_state.c +++ b/src/gallium/frontends/nine/nine_state.c @@ -999,7 +999,7 @@ update_textures_and_samplers(struct NineDevice9 *device) commit_samplers = FALSE; const uint16_t ps_mask = sampler_mask | context->enabled_samplers_mask_ps; context->bound_samplers_mask_ps = ps_mask; - num_textures = util_last_bit(ps_mask) + 1; + num_textures = util_last_bit(ps_mask); /* iterate over the enabled samplers */ u_foreach_bit(i, context->enabled_samplers_mask_ps) { const unsigned s = NINE_SAMPLER_PS(i); @@ -1046,7 +1046,7 @@ update_textures_and_samplers(struct NineDevice9 *device) sampler_mask = context->programmable_vs ? context->vs->sampler_mask : 0; const uint16_t vs_mask = sampler_mask | context->enabled_samplers_mask_vs; context->bound_samplers_mask_vs = vs_mask; - num_textures = util_last_bit(vs_mask) + 1; + num_textures = util_last_bit(vs_mask); u_foreach_bit(i, context->enabled_samplers_mask_vs) { const unsigned s = NINE_SAMPLER_VS(i); int sRGB = context->samp[s][D3DSAMP_SRGBTEXTURE] ? 1 : 0;