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

Revert "nir: Support sysval tess levels in SPIR-V to NIR"

Browse Source 
This reverts commit d2d4677b56.

The option is not used by any driver.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5744>
This commit is contained in:
Jonathan Marek
2020-07-03 22:11:16 -04:00
parent 2044bdac4f
commit 8453d2941a
2 changed files with 2 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -64,11 +64,6 @@ struct spirv_to_nir_options {
*/ */
bool frag_coord_is_sysval; bool frag_coord_is_sysval;
/* Whether to lower TessLevelInner and TessLevelOuter to system values.
* This is the inverse of GLSLTessLevelsAsInputs in GLSL.
*/
bool tess_levels_are_sysvals;
struct spirv_supported_capabilities caps; struct spirv_supported_capabilities caps;
/* Address format for various kinds of pointers. */ /* Address format for various kinds of pointers. */

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

@@ -1354,22 +1354,10 @@ vtn_get_builtin_location(struct vtn_builder *b,
vtn_fail("invalid stage for SpvBuiltInViewportIndex"); vtn_fail("invalid stage for SpvBuiltInViewportIndex");
break; break;
case SpvBuiltInTessLevelOuter: case SpvBuiltInTessLevelOuter:
if (b->options && b->options->tess_levels_are_sysvals &&
*mode == nir_var_shader_in) {
*location = SYSTEM_VALUE_TESS_LEVEL_OUTER;
set_mode_system_value(b, mode);
} else {
*location = VARYING_SLOT_TESS_LEVEL_OUTER; *location = VARYING_SLOT_TESS_LEVEL_OUTER;
}
break; break;
case SpvBuiltInTessLevelInner: case SpvBuiltInTessLevelInner:
if (b->options && b->options->tess_levels_are_sysvals &&
*mode == nir_var_shader_in) {
*location = SYSTEM_VALUE_TESS_LEVEL_INNER;
set_mode_system_value(b, mode);
} else {
*location = VARYING_SLOT_TESS_LEVEL_INNER; *location = VARYING_SLOT_TESS_LEVEL_INNER;
}
break; break;
case SpvBuiltInTessCoord: case SpvBuiltInTessCoord:
*location = SYSTEM_VALUE_TESS_COORD; *location = SYSTEM_VALUE_TESS_COORD;