Mesa (master): i965/gs: Make MAX_GS_INPUT_VERTICES a #define in brw_context.h.
Kenneth Graunke
kwg at kemper.freedesktop.org
Sat Oct 10 18:42:01 UTC 2015
Module: Mesa
Branch: master
Commit: a23bdd1fae196e91ebfbb4b0c7730652c63a91ea
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a23bdd1fae196e91ebfbb4b0c7730652c63a91ea
Author: Kenneth Graunke <kenneth at whitecape.org>
Date: Thu Mar 12 05:26:40 2015 -0700
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 at whitecape.org>
Reviewed-by: Matt Turner <mattst88 at gmail.com>
---
src/mesa/drivers/dri/i965/brw_context.h | 2 ++
src/mesa/drivers/dri/i965/brw_vec4_gs_visitor.cpp | 2 --
src/mesa/drivers/dri/i965/gen6_gs_visitor.cpp | 2 --
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
More information about the mesa-commit
mailing list