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

nir: gather which images are buffers

Browse Source 
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5209>
This commit is contained in:
Marek Olšák
2020-05-21 05:13:01 -04:00
committed by Marge Bot
parent f8ef15c061
commit 6503e4be13
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/compiler/nir/nir_gather_info.c
View File

@@ -597,6 +597,7 @@ nir_shader_gather_info(nir_shader *shader, nir_function_impl *entrypoint)
{ {
shader->info.num_textures = 0; shader->info.num_textures = 0;
shader->info.num_images = 0; shader->info.num_images = 0;
shader->info.image_buffers = 0;
shader->info.last_msaa_image = -1; shader->info.last_msaa_image = -1;
nir_foreach_variable(var, &shader->uniforms) { nir_foreach_variable(var, &shader->uniforms) {
@@ -608,7 +609,17 @@ nir_shader_gather_info(nir_shader *shader, nir_function_impl *entrypoint)
continue; continue;
shader->info.num_textures += glsl_type_get_sampler_count(var->type); shader->info.num_textures += glsl_type_get_sampler_count(var->type);
shader->info.num_images += glsl_type_get_image_count(var->type);
unsigned num_image_slots = glsl_type_get_image_count(var->type);
if (num_image_slots) {
const struct glsl_type *image_type = glsl_without_array(var->type);
if (glsl_get_sampler_dim(image_type) == GLSL_SAMPLER_DIM_BUF) {
shader->info.image_buffers |=
BITFIELD_RANGE(shader->info.num_images, num_image_slots);
}
shader->info.num_images += num_image_slots;
}
/* Assuming image slots don't have holes (e.g. OpenGL) */ /* Assuming image slots don't have holes (e.g. OpenGL) */
if (glsl_type_is_image(var->type) && if (glsl_type_is_image(var->type) &&

2
src/compiler/shader_info.h
View File

@@ -152,6 +152,8 @@ typedef struct shader_info {
/** Bitfield of which images are used */ /** Bitfield of which images are used */
uint32_t images_used; uint32_t images_used;
/** Bitfield of which images are buffers. */
uint32_t image_buffers;
/* SPV_KHR_float_controls: execution mode for floating point ops */ /* SPV_KHR_float_controls: execution mode for floating point ops */
uint16_t float_controls_execution_mode; uint16_t float_controls_execution_mode;