From 43b243236824ce80daaa5cb4af5db94aaca0855e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Tue, 23 Sep 2014 17:17:01 +0200 Subject: [PATCH] r600g,radeonsi: convert TGSI shader type to LLVM shader type MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The values are hardcoded in the LLVM backend, but the TGSI definitions are going to be changed with tessellation, e.g. TGSI_PROCESSOR_COMPUTE will be increased by 2. We'll use VS for LS and HS, because there's nothing special about them from the LLVM backend point of view, even though the hardware side is different. We do the same for ES. Reviewed-by: Michel Dänzer --- src/gallium/drivers/radeon/radeon_llvm_emit.c | 31 ++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/src/gallium/drivers/radeon/radeon_llvm_emit.c b/src/gallium/drivers/radeon/radeon_llvm_emit.c index 53694b74918..dc871d79717 100644 --- a/src/gallium/drivers/radeon/radeon_llvm_emit.c +++ b/src/gallium/drivers/radeon/radeon_llvm_emit.c @@ -40,6 +40,16 @@ #define FS_STRING_LEN 30 #define TRIPLE_STRING_LEN 7 +/** + * Shader types for the LLVM backend. + */ +enum radeon_llvm_shader_type { + RADEON_LLVM_SHADER_PS = 0, + RADEON_LLVM_SHADER_VS = 1, + RADEON_LLVM_SHADER_GS = 2, + RADEON_LLVM_SHADER_CS = 3, +}; + /** * Set the shader type we want to compile * @@ -48,7 +58,26 @@ void radeon_llvm_shader_type(LLVMValueRef F, unsigned type) { char Str[2]; - sprintf(Str, "%1d", type); + enum radeon_llvm_shader_type llvm_type; + + switch (type) { + case TGSI_PROCESSOR_VERTEX: + llvm_type = RADEON_LLVM_SHADER_VS; + break; + case TGSI_PROCESSOR_GEOMETRY: + llvm_type = RADEON_LLVM_SHADER_GS; + break; + case TGSI_PROCESSOR_FRAGMENT: + llvm_type = RADEON_LLVM_SHADER_PS; + break; + case TGSI_PROCESSOR_COMPUTE: + llvm_type = RADEON_LLVM_SHADER_CS; + break; + default: + assert(0); + } + + sprintf(Str, "%1d", llvm_type); LLVMAddTargetDependentFunctionAttr(F, "ShaderType", Str); -- 2.30.2