summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenneth Graunke <kenneth@whitecape.org>2015-03-12 05:26:40 -0700
committerKenneth Graunke <kenneth@whitecape.org>2015-10-10 11:40:19 -0700
commita23bdd1fae196e91ebfbb4b0c7730652c63a91ea (patch)
tree8af68ab7f4798b9e6f4d76aa2e126bc6d1b43e1d
parent2953c3d76178d7589947e6ea1dbd902b7b02b3d4 (diff)
downloadexternal_mesa3d-a23bdd1fae196e91ebfbb4b0c7730652c63a91ea.zip
external_mesa3d-a23bdd1fae196e91ebfbb4b0c7730652c63a91ea.tar.gz
external_mesa3d-a23bdd1fae196e91ebfbb4b0c7730652c63a91ea.tar.bz2
i965/gs: Make MAX_GS_INPUT_VERTICES a #define in brw_context.h.
For scalar VS, I'll need this in brw_fs.cpp as well. It seems silly to redeclare it in three places. Signed-off-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Matt Turner <mattst88@gmail.com>
-rw-r--r--src/mesa/drivers/dri/i965/brw_context.h2
-rw-r--r--src/mesa/drivers/dri/i965/brw_vec4_gs_visitor.cpp2
-rw-r--r--src/mesa/drivers/dri/i965/gen6_gs_visitor.cpp2
3 files changed, 2 insertions, 4 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_context.h b/src/mesa/drivers/dri/i965/brw_context.h
index 9ad6b4d..e59478a 100644
--- a/src/mesa/drivers/dri/i965/brw_context.h
+++ b/src/mesa/drivers/dri/i965/brw_context.h
@@ -955,6 +955,8 @@ struct intel_batchbuffer {
} saved;
};
+#define MAX_GS_INPUT_VERTICES 6
+
#define BRW_MAX_XFB_STREAMS 4
struct brw_transform_feedback_object {
diff --git a/src/mesa/drivers/dri/i965/brw_vec4_gs_visitor.cpp b/src/mesa/drivers/dri/i965/brw_vec4_gs_visitor.cpp
index 4ce471e..775f64d 100644
--- a/src/mesa/drivers/dri/i965/brw_vec4_gs_visitor.cpp
+++ b/src/mesa/drivers/dri/i965/brw_vec4_gs_visitor.cpp
@@ -30,8 +30,6 @@
#include "brw_vec4_gs_visitor.h"
#include "gen6_gs_visitor.h"
-const unsigned MAX_GS_INPUT_VERTICES = 6;
-
namespace brw {
vec4_gs_visitor::vec4_gs_visitor(const struct brw_compiler *compiler,
diff --git a/src/mesa/drivers/dri/i965/gen6_gs_visitor.cpp b/src/mesa/drivers/dri/i965/gen6_gs_visitor.cpp
index 59a7655..671a535 100644
--- a/src/mesa/drivers/dri/i965/gen6_gs_visitor.cpp
+++ b/src/mesa/drivers/dri/i965/gen6_gs_visitor.cpp
@@ -31,8 +31,6 @@
#include "gen6_gs_visitor.h"
-const unsigned MAX_GS_INPUT_VERTICES = 6;
-
namespace brw {
void