From 028dbd35bab1b9dba6911f3bf9b3a02a87e176ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= <marek.olsak@amd.com>
Date: Wed, 31 Jul 2019 16:55:33 -0400
Subject: [PATCH] compiler: add shader_info.vs.blit_sgprs_amd

for internal radeonsi shaders
---
 src/compiler/shader_info.h                   | 7 +++++++
 src/gallium/auxiliary/nir/tgsi_to_nir.c      | 3 +++
 src/gallium/drivers/radeonsi/si_shader_nir.c | 2 ++
 3 files changed, 12 insertions(+)

diff --git a/src/compiler/shader_info.h b/src/compiler/shader_info.h
index 115dd01e2b9..15150aa9b2e 100644
--- a/src/compiler/shader_info.h
+++ b/src/compiler/shader_info.h
@@ -158,6 +158,13 @@ typedef struct shader_info {
          /* Which inputs are doubles */
          uint64_t double_inputs;
 
+         /* For AMD-specific driver-internal shaders. It replaces vertex
+          * buffer loads with code generating VS inputs from scalar registers.
+          *
+          * Valid values: SI_VS_BLIT_SGPRS_POS_*
+          */
+         unsigned blit_sgprs_amd;
+
          /* True if the shader writes position in window space coordinates pre-transform */
          bool window_space_position;
       } vs;
diff --git a/src/gallium/auxiliary/nir/tgsi_to_nir.c b/src/gallium/auxiliary/nir/tgsi_to_nir.c
index 4770e8f4790..ca805df8739 100644
--- a/src/gallium/auxiliary/nir/tgsi_to_nir.c
+++ b/src/gallium/auxiliary/nir/tgsi_to_nir.c
@@ -2106,6 +2106,9 @@ ttn_compile_init(const void *tgsi_tokens,
       case TGSI_PROPERTY_NEXT_SHADER:
          s->info.next_stage = tgsi_processor_to_shader_stage(value);
          break;
+      case TGSI_PROPERTY_VS_BLIT_SGPRS_AMD:
+         s->info.vs.blit_sgprs_amd = value;
+         break;
       default:
          if (value) {
             fprintf(stderr, "tgsi_to_nir: unhandled TGSI property %u = %u\n",
diff --git a/src/gallium/drivers/radeonsi/si_shader_nir.c b/src/gallium/drivers/radeonsi/si_shader_nir.c
index ebeaa631e8a..0f3a11268f7 100644
--- a/src/gallium/drivers/radeonsi/si_shader_nir.c
+++ b/src/gallium/drivers/radeonsi/si_shader_nir.c
@@ -424,6 +424,8 @@ void si_nir_scan_shader(const struct nir_shader *nir,
 	if (nir->info.stage == MESA_SHADER_VERTEX) {
 		info->properties[TGSI_PROPERTY_VS_WINDOW_SPACE_POSITION] =
 			nir->info.vs.window_space_position;
+		info->properties[TGSI_PROPERTY_VS_BLIT_SGPRS_AMD] =
+			nir->info.vs.blit_sgprs_amd;
 	}
 
 	if (nir->info.stage == MESA_SHADER_TESS_CTRL) {