summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers/r600/r600_pipe.h
diff options
context:
space:
mode:
authorEdward O'Callaghan <[email protected]>2015-08-29 18:31:08 +1000
committerMarek Olšák <[email protected]>2015-08-30 11:41:00 +0200
commit3eed81a97b2fa1f98a2ae577b8b6e04cb144f31a (patch)
treeb64b9a673f7b1d6b0a7063076cdcef4b6adf960b /src/gallium/drivers/r600/r600_pipe.h
parentb4dee1b6360a91117c7a754ed70f359f6000a0de (diff)
r600g: Set geometry properties in r600_create_shader_state()
The selector is shared by all shader variants, so the individual shaders shouldn't change it. Use tgsi_shader_scan() results to set geometry properties within a r600_create_shader_state() call and treat said propertices in the selector as read-only within r600_shader_from_tgsi(). Signed-off-by: Edward O'Callaghan <[email protected]> Signed-off-by: Marek Olšák <[email protected]>
Diffstat (limited to 'src/gallium/drivers/r600/r600_pipe.h')
-rw-r--r--src/gallium/drivers/r600/r600_pipe.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/gallium/drivers/r600/r600_pipe.h b/src/gallium/drivers/r600/r600_pipe.h
index eb7036048e5..4bd3d7cf75b 100644
--- a/src/gallium/drivers/r600/r600_pipe.h
+++ b/src/gallium/drivers/r600/r600_pipe.h
@@ -36,6 +36,8 @@
#include "util/list.h"
#include "util/u_transfer.h"
+#include "tgsi/tgsi_scan.h"
+
#define R600_NUM_ATOMS 75
#define R600_MAX_VIEWPORTS 16
@@ -305,6 +307,7 @@ struct r600_pipe_shader_selector {
struct tgsi_token *tokens;
struct pipe_stream_output_info so;
+ struct tgsi_shader_info info;
unsigned num_shaders;