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

mesa/glsl: set num_textures per stage directly in shader_info

Browse Source 
Reviewed-by: Eric Anholt <eric@anholt.net>
This commit is contained in:
Timothy Arceri
2016-11-04 11:40:10 +11:00
parent c46a630000
commit 4807a83da0
6 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/compiler/glsl/glsl_to_nir.cpp
View File

@@ -149,7 +149,6 @@ glsl_to_nir(const struct gl_shader_program *shader_prog,
shader->info->name = ralloc_asprintf(shader, "GLSL%d", shader_prog->Name);
if (shader_prog->Label)
shader->info->label = ralloc_strdup(shader, shader_prog->Label);
shader->info->num_textures = util_last_bit(sh->Program->SamplersUsed);
shader->info->clip_distance_array_size = sh->Program->ClipDistanceArraySize;
shader->info->cull_distance_array_size = sh->Program->CullDistanceArraySize;
shader->info->has_transform_feedback_varyings =

2
src/compiler/glsl/link_uniforms.cpp
View File

@@ -1315,7 +1315,7 @@ link_assign_uniform_locations(struct gl_shader_program *prog,
uniform_size.process(var);
}
sh->num_samplers = uniform_size.num_shader_samplers;
sh->Program->info.num_textures = uniform_size.num_shader_samplers;
sh->NumImages = uniform_size.num_shader_images;
sh->num_uniform_components = uniform_size.num_shader_uniform_components;
sh->num_combined_uniform_components = sh->num_uniform_components;

3
src/compiler/glsl/linker.cpp
View File

@@ -3067,7 +3067,8 @@ check_resources(struct gl_context *ctx, struct gl_shader_program *prog)
if (sh == NULL)
continue;
if (sh->num_samplers > ctx->Const.Program[i].MaxTextureImageUnits) {
if (sh->Program->info.num_textures >
ctx->Const.Program[i].MaxTextureImageUnits) {
linker_error(prog, "Too many %s shader texture samplers\n",
_mesa_shader_stage_to_string(i));
}