diff options
author | Timothy Arceri <[email protected]> | 2016-05-27 19:07:19 +1000 |
---|---|---|
committer | Timothy Arceri <[email protected]> | 2016-05-30 15:11:47 +1000 |
commit | aac90ba2920cf5ceb4df6dba776dd3952780e456 (patch) | |
tree | 54527553f21f4df54c65152f11ee1e324b892bd9 /src/compiler/glsl/ir.cpp | |
parent | 87fb5aa3e741e9b93bf09509ff14d4cbc683e482 (diff) |
glsl: fix xfb_offset unsized array validation
This partially fixes CTS test:
GL44-CTS.enhanced_layouts.xfb_get_program_resource_api
The test now fails at a tes evaluation shader with unsized output arrays.
The ARB_enhanced_layouts spec says:
"It is a compile-time error to apply xfb_offset to the declaration of an
unsized array."
So this seems like a bug in the CTS.
Reviewed-by: Dave Airlie <[email protected]>
Diffstat (limited to 'src/compiler/glsl/ir.cpp')
-rw-r--r-- | src/compiler/glsl/ir.cpp | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/src/compiler/glsl/ir.cpp b/src/compiler/glsl/ir.cpp index 5bb3ac3c214..70859a7bd9d 100644 --- a/src/compiler/glsl/ir.cpp +++ b/src/compiler/glsl/ir.cpp @@ -2021,3 +2021,26 @@ mode_string(const ir_variable *var) assert(!"Should not get here."); return "invalid variable"; } + +/** + * Get the varying type stripped of the outermost array if we're processing + * a stage whose varyings are arrays indexed by a vertex number (such as + * geometry shader inputs). + */ +const glsl_type * +get_varying_type(const ir_variable *var, gl_shader_stage stage) +{ + const glsl_type *type = var->type; + + if (!var->data.patch && + ((var->data.mode == ir_var_shader_out && + stage == MESA_SHADER_TESS_CTRL) || + (var->data.mode == ir_var_shader_in && + (stage == MESA_SHADER_TESS_CTRL || stage == MESA_SHADER_TESS_EVAL || + stage == MESA_SHADER_GEOMETRY)))) { + assert(type->is_array()); + type = type->fields.array; + } + + return type; +} |