Mesa (master): compiler: Store the clip/ cull distance array sizes in shader_info.
Kenneth Graunke
kwg at kemper.freedesktop.org
Sat Nov 19 21:30:16 UTC 2016
Module: Mesa
Branch: master
Commit: c447ca64c13f386474e518e0e8dd523ee24507fe
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c447ca64c13f386474e518e0e8dd523ee24507fe
Author: Kenneth Graunke <kenneth at whitecape.org>
Date: Mon Oct 3 22:18:09 2016 -0700
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 <kenneth at whitecape.org>
Reviewed-by: Jason Ekstrand <jason at jlekstrand.net>
---
src/compiler/glsl/glsl_to_nir.cpp | 4 ++--
src/compiler/shader_info.h | 7 +++++--
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 e1b8cea..90fdd69 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 f0dfecc..7ea5d9c 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 f4eb8b6..2707a07 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:
More information about the mesa-commit
mailing list