fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-23 13:20:14 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

glsl: set ShaderStorageBlocksWriteAccess in the nir linker

Browse source 
Reviewed-by: Alejandro Piñeiro <apinheiro@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4050>
This commit is contained in:
Timothy Arceri 2020-01-27 13:29:51 +11:00 • committed by Marge Bot
parent 17f240b874
commit 79127f8d5b
1 changed files with 32 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/compiler/glsl/gl_nir_link_uniforms.c
View file

@ -177,6 +177,7 @@ struct nir_link_uniforms_state {
unsigned num_shader_uniform_components; unsigned num_shader_uniform_components;
unsigned shader_samplers_used; unsigned shader_samplers_used;
unsigned shader_shadow_samplers; unsigned shader_shadow_samplers;
unsigned shader_storage_blocks_write_access;
struct gl_program_parameter_list *params; struct gl_program_parameter_list *params;
/* per-variable */ /* per-variable */
@ -980,6 +981,7 @@ gl_nir_link_uniforms(struct gl_context *ctx,
state.num_shader_samplers = 0; state.num_shader_samplers = 0;
state.num_shader_images = 0; state.num_shader_images = 0;
state.num_shader_uniform_components = 0; state.num_shader_uniform_components = 0;
state.shader_storage_blocks_write_access = 0;
state.shader_samplers_used = 0; state.shader_samplers_used = 0;
state.shader_shadow_samplers = 0; state.shader_shadow_samplers = 0;
state.params = fill_parameters ? sh->Program->Parameters : NULL; state.params = fill_parameters ? sh->Program->Parameters : NULL;
@ -1046,16 +1048,16 @@ gl_nir_link_uniforms(struct gl_context *ctx,
int location = var->data.location; int location = var->data.location;
if (!prog->data->spirv && state.var_is_in_block && struct gl_uniform_block *blocks;
glsl_without_array(state.current_var->type) != state.current_var->interface_type) { int num_blocks;
int buffer_block_index = -1;
int buffer_block_index = -1; if (!prog->data->spirv && state.var_is_in_block) {
/* If the uniform is inside a uniform block determine its block index by /* If the uniform is inside a uniform block determine its block index by
* comparing the bindings, we can not use names. * comparing the bindings, we can not use names.
*/ */
struct gl_uniform_block *blocks = nir_variable_is_in_ssbo(state.current_var) ? blocks = nir_variable_is_in_ssbo(state.current_var) ?
prog->data->ShaderStorageBlocks : prog->data->UniformBlocks; prog->data->ShaderStorageBlocks : prog->data->UniformBlocks;
int num_blocks = nir_variable_is_in_ssbo(state.current_var) ? num_blocks = nir_variable_is_in_ssbo(state.current_var) ?
prog->data->NumShaderStorageBlocks : prog->data->NumUniformBlocks; prog->data->NumShaderStorageBlocks : prog->data->NumUniformBlocks;
bool is_interface_array = bool is_interface_array =
@ -1086,6 +1088,28 @@ gl_nir_link_uniforms(struct gl_context *ctx,
} }
} }
if (nir_variable_is_in_ssbo(var) &&
!(var->data.access & ACCESS_NON_WRITEABLE)) {
unsigned array_size = is_interface_array ?
glsl_get_length(var->type) : 1;
STATIC_ASSERT(MAX_SHADER_STORAGE_BUFFERS <= 32);
/* Shaders that use too many SSBOs will fail to compile, which
* we don't care about.
*
* This is true for shaders that do not use too many SSBOs:
*/
if (buffer_block_index + array_size <= 32) {
state.shader_storage_blocks_write_access |=
u_bit_consecutive(buffer_block_index, array_size);
}
}
}
if (!prog->data->spirv && state.var_is_in_block &&
glsl_without_array(state.current_var->type) != state.current_var->interface_type) {
bool found = false; bool found = false;
char sentinel = '\0'; char sentinel = '\0';
@ -1186,6 +1210,8 @@ gl_nir_link_uniforms(struct gl_context *ctx,
} }
sh->Program->SamplersUsed = state.shader_samplers_used; sh->Program->SamplersUsed = state.shader_samplers_used;
sh->Program->sh.ShaderStorageBlocksWriteAccess =
state.shader_storage_blocks_write_access;
sh->shadow_samplers = state.shader_shadow_samplers; sh->shadow_samplers = state.shader_shadow_samplers;
sh->Program->info.num_textures = state.num_shader_samplers; sh->Program->info.num_textures = state.num_shader_samplers;
sh->Program->info.num_images = state.num_shader_images; sh->Program->info.num_images = state.num_shader_images;