diff options
| author | Timothy Arceri <[email protected]> | 2017-12-06 13:32:17 +1100 |
|---|---|---|
| committer | Timothy Arceri <[email protected]> | 2018-01-05 11:58:55 +1100 |
| commit | 71f82dc9a3d9823f91e4cf9d5ab9d54047ba8ce4 (patch) | |
| tree | 18138812c8eb55ac178e5363b25d59c8a6a90081 | |
| parent | 9755eeb15a1396e36afc068d31aa109adbdd3082 (diff) | |
st/glsl_to_nir/radeonsi: enable tessellation shaders
Reviewed-by: Nicolai Hähnle <[email protected]>
Reviewed-by: Marek Olšák <[email protected]>
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_shader_nir.c | 2 | ||||
| -rw-r--r-- | src/mesa/state_tracker/st_glsl_to_nir.cpp | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/gallium/drivers/radeonsi/si_shader_nir.c b/src/gallium/drivers/radeonsi/si_shader_nir.c index d331dfeaaa7..d5b8f835b91 100644 --- a/src/gallium/drivers/radeonsi/si_shader_nir.c +++ b/src/gallium/drivers/radeonsi/si_shader_nir.c @@ -157,6 +157,8 @@ void si_nir_scan_shader(const struct nir_shader *nir, assert(nir->info.stage == MESA_SHADER_VERTEX || nir->info.stage == MESA_SHADER_GEOMETRY || + nir->info.stage == MESA_SHADER_TESS_CTRL || + nir->info.stage == MESA_SHADER_TESS_EVAL || nir->info.stage == MESA_SHADER_FRAGMENT); info->processor = pipe_shader_type_from_mesa(nir->info.stage); diff --git a/src/mesa/state_tracker/st_glsl_to_nir.cpp b/src/mesa/state_tracker/st_glsl_to_nir.cpp index 276450a64ac..5683dfcccce 100644 --- a/src/mesa/state_tracker/st_glsl_to_nir.cpp +++ b/src/mesa/state_tracker/st_glsl_to_nir.cpp @@ -675,7 +675,9 @@ st_finalize_nir(struct st_context *st, struct gl_program *prog, &nir->num_outputs, nir->info.stage); st_nir_fixup_varying_slots(st, &nir->outputs); - } else if (nir->info.stage == MESA_SHADER_GEOMETRY) { + } else if (nir->info.stage == MESA_SHADER_GEOMETRY || + nir->info.stage == MESA_SHADER_TESS_CTRL || + nir->info.stage == MESA_SHADER_TESS_EVAL) { sort_varyings(&nir->inputs); st_nir_assign_var_locations(&nir->inputs, &nir->num_inputs, |