From 944e8b08cd182d00f82e8fa1efea4503eed18e1d Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Sun, 25 Sep 2016 14:23:55 -0700 Subject: [PATCH] spirv: Silence unsupported tessellation capability warnings. ...when the capability bit is set. Signed-off-by: Kenneth Graunke Reviewed-by: Iago Toral Quiroga [v1] Reviewed-by: Jason Ekstrand --- src/compiler/spirv/nir_spirv.h | 1 + src/compiler/spirv/spirv_to_nir.c | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/compiler/spirv/nir_spirv.h b/src/compiler/spirv/nir_spirv.h index 2850e91e8b8..e3f4ee85cc9 100644 --- a/src/compiler/spirv/nir_spirv.h +++ b/src/compiler/spirv/nir_spirv.h @@ -47,6 +47,7 @@ struct nir_spirv_specialization { struct nir_spirv_supported_extensions { bool float64; bool image_ms_array; + bool tessellation; }; nir_function *spirv_to_nir(const uint32_t *words, size_t word_count, diff --git a/src/compiler/spirv/spirv_to_nir.c b/src/compiler/spirv/spirv_to_nir.c index 841f8fdc84e..917072392c5 100644 --- a/src/compiler/spirv/spirv_to_nir.c +++ b/src/compiler/spirv/spirv_to_nir.c @@ -2602,8 +2602,6 @@ vtn_handle_preamble_instruction(struct vtn_builder *b, SpvOp opcode, break; case SpvCapabilityGeometryStreams: - case SpvCapabilityTessellation: - case SpvCapabilityTessellationPointSize: case SpvCapabilityLinkage: case SpvCapabilityVector16: case SpvCapabilityFloat16Buffer: @@ -2645,6 +2643,11 @@ vtn_handle_preamble_instruction(struct vtn_builder *b, SpvOp opcode, case SpvCapabilityImageMSArray: spv_check_supported(image_ms_array, cap); break; + + case SpvCapabilityTessellation: + case SpvCapabilityTessellationPointSize: + spv_check_supported(tessellation, cap); + break; } break; } -- 2.30.2