KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nir: Add an option for lowering TessLevelInner/Outer to vecs 

The GLSL to NIR compiler supports the LowerTessLevel flag to convert
gl_TessLevelInner/Outer from their GLSL declarations as arrays of
floats to vec4/vec2s to better match how they are represented in
hardware.

This commit adds the similar support to the SPIR-V to NIR compiler so
turnip can use the same IR3/NIR tess lowering passes as freedreno.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5059>
This commit is contained in:
Brian Ho 2020-05-14 12:17:48 -07:00 committed by Marge Bot
parent d2d4677b56
commit d2df076120
2 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/compiler/spirv/nir_spirv.h
View File

@ -69,6 +69,12 @@ struct spirv_to_nir_options {
*/
bool tess_levels_are_sysvals;
/* Whether to lower TessLevelInner/Outer from their SPIR-V declarations
* as arrays of floats to vec4 and vec2 respectively. This is the same as
* LowerTessLevel in GLSL.
*/
bool lower_tess_levels_to_vec;
struct spirv_supported_capabilities caps;
/* Address format for various kinds of pointers. */

24
src/compiler/spirv/vtn_variables.c
View File

@ -1617,6 +1617,11 @@ apply_var_decoration(struct vtn_builder *b,
switch (builtin) {
case SpvBuiltInTessLevelOuter:
case SpvBuiltInTessLevelInner:
/* Since the compact flag is only valid on arrays, don't set it if
* we are lowering TessLevelInner/Outer to vec4/vec2. */
if (!b->options || !b->options->lower_tess_levels_to_vec)
var_data->compact = true;
break;
case SpvBuiltInClipDistance:
case SpvBuiltInCullDistance:
var_data->compact = true;
@ -1828,6 +1833,22 @@ var_decoration_cb(struct vtn_builder *b, struct vtn_value *val, int member,
}
}
static void
var_decoration_tess_level_vec_cb(
struct vtn_builder *b, struct vtn_value *val, int member,
const struct vtn_decoration *dec, void *void_var)
{
struct vtn_variable *vtn_var = void_var;
if (dec->decoration == SpvDecorationBuiltIn) {
SpvBuiltIn builtin = dec->operands[0];
if (builtin == SpvBuiltInTessLevelOuter) {
vtn_var->var->type = glsl_vector_type(GLSL_TYPE_FLOAT, 4);
} else if (builtin == SpvBuiltInTessLevelInner) {
vtn_var->var->type = glsl_vector_type(GLSL_TYPE_FLOAT, 2);
}
}
}
enum vtn_variable_mode
vtn_storage_class_to_mode(struct vtn_builder *b,
SpvStorageClass class,
@ -2407,6 +2428,9 @@ vtn_create_variable(struct vtn_builder *b, struct vtn_value *val,
vtn_foreach_decoration(b, val, var_decoration_cb, var);
vtn_foreach_decoration(b, val, ptr_decoration_cb, val->pointer);
if (b->options && b->options->lower_tess_levels_to_vec)
vtn_foreach_decoration(b, val, var_decoration_tess_level_vec_cb, var);
/* Propagate access flags from the OpVariable decorations. */
val->pointer->access |= var->access;