OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nir: Stop assuming shader_info::textures_used is 32-bit

Browse Source 
This isn't a hot path.  We don't need to be manually using the
INSIDE_WORD version which will assert if we ever get a bigger texture
index.

Reviewed-by: Karol Herbst <kherbst@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15988>
This commit is contained in:
Jason Ekstrand
2022-04-15 15:52:54 -05:00
parent 625b352f14
commit 28f534350c
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/compiler/glsl/gl_nir_lower_samplers_as_deref.c
View File

@@ -240,12 +240,15 @@ record_textures_used(struct shader_info *info,
const unsigned size = const unsigned size =
glsl_type_is_array(var->type) ? glsl_get_aoa_size(var->type) : 1; glsl_type_is_array(var->type) ? glsl_get_aoa_size(var->type) : 1;
BITSET_SET_RANGE_INSIDE_WORD(info->textures_used, var->data.binding, var->data.binding + (MAX2(size, 1) - 1)); BITSET_SET_RANGE(info->textures_used, var->data.binding,
var->data.binding + (MAX2(size, 1) - 1));
if (op == nir_texop_txf || if (op == nir_texop_txf ||
op == nir_texop_txf_ms || op == nir_texop_txf_ms ||
op == nir_texop_txf_ms_mcs_intel) op == nir_texop_txf_ms_mcs_intel) {
BITSET_SET_RANGE_INSIDE_WORD(info->textures_used_by_txf, var->data.binding, var->data.binding + (MAX2(size, 1) - 1)); BITSET_SET_RANGE(info->textures_used_by_txf, var->data.binding,
var->data.binding + (MAX2(size, 1) - 1));
}
} }
static bool static bool