Module: Mesa Branch: master Commit: 872b21487c9f4dee736586e309bb53155dc0e0ab URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=872b21487c9f4dee736586e309bb53155dc0e0ab
Author: Bas Nieuwenhuizen <[email protected]> Date: Mon Oct 16 22:15:47 2017 +0200 ac/nir: Add HS calling convention. Needed for GFX9 merged shaders. Reviewed-by: Dave Airlie <[email protected]> --- src/amd/common/ac_nir_to_llvm.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/amd/common/ac_nir_to_llvm.c b/src/amd/common/ac_nir_to_llvm.c index 3ba3ebf051..1df97b59a2 100644 --- a/src/amd/common/ac_nir_to_llvm.c +++ b/src/amd/common/ac_nir_to_llvm.c @@ -39,6 +39,7 @@ enum radeon_llvm_calling_convention { RADEON_LLVM_AMDGPU_GS = 88, RADEON_LLVM_AMDGPU_PS = 89, RADEON_LLVM_AMDGPU_CS = 90, + RADEON_LLVM_AMDGPU_HS = 93, }; #define CONST_ADDR_SPACE 2 @@ -223,13 +224,15 @@ static void set_llvm_calling_convention(LLVMValueRef func, switch (stage) { case MESA_SHADER_VERTEX: - case MESA_SHADER_TESS_CTRL: case MESA_SHADER_TESS_EVAL: calling_conv = RADEON_LLVM_AMDGPU_VS; break; case MESA_SHADER_GEOMETRY: calling_conv = RADEON_LLVM_AMDGPU_GS; break; + case MESA_SHADER_TESS_CTRL: + calling_conv = HAVE_LLVM >= 0x0500 ? RADEON_LLVM_AMDGPU_HS : RADEON_LLVM_AMDGPU_VS; + break; case MESA_SHADER_FRAGMENT: calling_conv = RADEON_LLVM_AMDGPU_PS; break; _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
