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

compiler: Store the clip/cull distance array sizes in shader_info.

Browse Source 
We switched from a boolean to array lengths in gl_program a while back.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
This commit is contained in:
Kenneth Graunke
2016-10-03 22:18:09 -07:00
parent c4be6e0b8d
commit c447ca64c1
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -150,8 +150,8 @@ glsl_to_nir(const struct gl_shader_program *shader_prog,
shader->info->num_textures = util_last_bit(sh->Program->SamplersUsed); shader->info->num_textures = util_last_bit(sh->Program->SamplersUsed);
shader->info->num_ubos = sh->NumUniformBlocks; shader->info->num_ubos = sh->NumUniformBlocks;
shader->info->num_ssbos = sh->NumShaderStorageBlocks; shader->info->num_ssbos = sh->NumShaderStorageBlocks;
shader->info->uses_clip_distance_out = shader->info->clip_distance_array_size = sh->Program->ClipDistanceArraySize;
sh->Program->ClipDistanceArraySize != 0; shader->info->cull_distance_array_size = sh->Program->CullDistanceArraySize;
shader->info->separate_shader = shader_prog->SeparateShader; shader->info->separate_shader = shader_prog->SeparateShader;
shader->info->has_transform_feedback_varyings = shader->info->has_transform_feedback_varyings =
shader_prog->TransformFeedback.NumVarying > 0; shader_prog->TransformFeedback.NumVarying > 0;

7
src/compiler/shader_info.h
View File

@@ -67,8 +67,11 @@ typedef struct shader_info {
/* Whether or not this shader ever uses textureGather() */ /* Whether or not this shader ever uses textureGather() */
bool uses_texture_gather; bool uses_texture_gather;
/* Whether or not this shader uses the gl_ClipDistance output */ /* The size of the gl_ClipDistance[] array, if declared. */
bool uses_clip_distance_out; unsigned clip_distance_array_size;
/* The size of the gl_CullDistance[] array, if declared. */
unsigned cull_distance_array_size;
/* Whether or not separate shader objects were used */ /* Whether or not separate shader objects were used */
bool separate_shader; bool separate_shader;

3
src/mesa/program/prog_to_nir.c
View File

@@ -1054,7 +1054,8 @@ prog_to_nir(const struct gl_program *prog,
s->info->num_ssbos = 0; s->info->num_ssbos = 0;
s->info->num_images = 0; s->info->num_images = 0;
s->info->uses_texture_gather = false; s->info->uses_texture_gather = false;
s->info->uses_clip_distance_out = false; s->info->clip_distance_array_size = 0;
s->info->cull_distance_array_size = 0;
s->info->separate_shader = false; s->info->separate_shader = false;
fail: fail: