diff options
| author | Kenneth Graunke <[email protected]> | 2016-10-03 22:18:09 -0700 |
|---|---|---|
| committer | Kenneth Graunke <[email protected]> | 2016-11-19 12:30:25 -0800 |
| commit | c447ca64c13f386474e518e0e8dd523ee24507fe (patch) | |
| tree | 649321172760704dce72a18668759850512b4524 | |
| parent | c4be6e0b8d91746eccf334b9e20861af4036d06a (diff) | |
compiler: Store the clip/cull distance array sizes in shader_info.
We switched from a boolean to array lengths in gl_program a while back.
Signed-off-by: Kenneth Graunke <[email protected]>
Reviewed-by: Jason Ekstrand <[email protected]>
| -rw-r--r-- | src/compiler/glsl/glsl_to_nir.cpp | 4 | ||||
| -rw-r--r-- | src/compiler/shader_info.h | 7 | ||||
| -rw-r--r-- | src/mesa/program/prog_to_nir.c | 3 |
3 files changed, 9 insertions, 5 deletions
diff --git a/src/compiler/glsl/glsl_to_nir.cpp b/src/compiler/glsl/glsl_to_nir.cpp index e1b8cea600d..90fdd694007 100644 --- a/src/compiler/glsl/glsl_to_nir.cpp +++ b/src/compiler/glsl/glsl_to_nir.cpp @@ -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_ubos = sh->NumUniformBlocks; shader->info->num_ssbos = sh->NumShaderStorageBlocks; - shader->info->uses_clip_distance_out = - sh->Program->ClipDistanceArraySize != 0; + shader->info->clip_distance_array_size = sh->Program->ClipDistanceArraySize; + shader->info->cull_distance_array_size = sh->Program->CullDistanceArraySize; shader->info->separate_shader = shader_prog->SeparateShader; shader->info->has_transform_feedback_varyings = shader_prog->TransformFeedback.NumVarying > 0; diff --git a/src/compiler/shader_info.h b/src/compiler/shader_info.h index f0dfecc6aec..7ea5d9cce1f 100644 --- a/src/compiler/shader_info.h +++ b/src/compiler/shader_info.h @@ -67,8 +67,11 @@ typedef struct shader_info { /* Whether or not this shader ever uses textureGather() */ bool uses_texture_gather; - /* Whether or not this shader uses the gl_ClipDistance output */ - bool uses_clip_distance_out; + /* The size of the gl_ClipDistance[] array, if declared. */ + 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 */ bool separate_shader; diff --git a/src/mesa/program/prog_to_nir.c b/src/mesa/program/prog_to_nir.c index f4eb8b67bbb..2707a075b5d 100644 --- a/src/mesa/program/prog_to_nir.c +++ b/src/mesa/program/prog_to_nir.c @@ -1054,7 +1054,8 @@ prog_to_nir(const struct gl_program *prog, s->info->num_ssbos = 0; s->info->num_images = 0; 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; fail: |