Mesa (master): radv: set use_prim_id for tess shaders correctly.

Dave Airlie airlied at kemper.freedesktop.org
Sun Jun 25 22:45:54 UTC 2017


Module: Mesa
Branch: master
Commit: 4042892cee83cb04ca50908926d95215d7ab1d42
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=4042892cee83cb04ca50908926d95215d7ab1d42

Author: Dave Airlie <airlied at redhat.com>
Date:   Tue Jun 20 13:59:33 2017 +1000

radv: set use_prim_id for tess shaders correctly.

Just noticed in passing.

Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
Signed-off-by: Dave Airlie <airlied at redhat.com>

---

 src/amd/common/ac_nir_to_llvm.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/amd/common/ac_nir_to_llvm.c b/src/amd/common/ac_nir_to_llvm.c
index 49117d21bd..4d9c070dab 100644
--- a/src/amd/common/ac_nir_to_llvm.c
+++ b/src/amd/common/ac_nir_to_llvm.c
@@ -3869,11 +3869,13 @@ static void visit_intrinsic(struct nir_to_llvm_context *ctx,
 	case nir_intrinsic_load_primitive_id:
 		if (ctx->stage == MESA_SHADER_GEOMETRY)
 			result = ctx->gs_prim_id;
-		else if (ctx->stage == MESA_SHADER_TESS_CTRL)
+		else if (ctx->stage == MESA_SHADER_TESS_CTRL) {
+			ctx->shader_info->tcs.uses_prim_id = true;
 			result = ctx->tcs_patch_id;
-		else if (ctx->stage == MESA_SHADER_TESS_EVAL)
+		} else if (ctx->stage == MESA_SHADER_TESS_EVAL) {
+			ctx->shader_info->tcs.uses_prim_id = true;
 			result = ctx->tes_patch_id;
-		else
+		} else
 			fprintf(stderr, "Unknown primitive id intrinsic: %d", ctx->stage);
 		break;
 	case nir_intrinsic_load_sample_id:




More information about the mesa-commit mailing list