From 5fb13d871e062354a77a427b3a3fe7f3d6908e5a Mon Sep 17 00:00:00 2001 From: Paul Berry Date: Wed, 20 Mar 2013 11:54:33 -0700 Subject: [PATCH] i965: Stop including brw_vs.h from brw_vec4.h. This is backwards from what we are going to want in the long term, which is: - brw_vec4.h declares general-purpose vec4 infrastructure needed by both VS and GS - brw_vs.h includes brw_vec4.h and adds VS-specific parts. - brw_gs.h includes brw_vec4.h and adds GS-specific parts. Note that at the moment brw_vec.h contains a fair amount of VS-specific declarations--I plan to address that in a later patch. Reviewed-by: Ian Romanick Reviewed-by: Kenneth Graunke Reviewed-by: Matt Turner --- src/mesa/drivers/dri/i965/brw_vec4.cpp | 1 + src/mesa/drivers/dri/i965/brw_vec4.h | 5 ++++- src/mesa/drivers/dri/i965/brw_vec4_reg_allocate.cpp | 1 + src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp | 1 + src/mesa/drivers/dri/i965/brw_vec4_vp.cpp | 1 + src/mesa/drivers/dri/i965/test_vec4_register_coalesce.cpp | 1 + 6 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/mesa/drivers/dri/i965/brw_vec4.cpp b/src/mesa/drivers/dri/i965/brw_vec4.cpp index 429e8cc9fd7..d7671a458b3 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4.cpp +++ b/src/mesa/drivers/dri/i965/brw_vec4.cpp @@ -23,6 +23,7 @@ #include "brw_vec4.h" #include "brw_cfg.h" +#include "brw_vs.h" extern "C" { #include "main/macros.h" diff --git a/src/mesa/drivers/dri/i965/brw_vec4.h b/src/mesa/drivers/dri/i965/brw_vec4.h index 111b1050983..b331372d16c 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4.h +++ b/src/mesa/drivers/dri/i965/brw_vec4.h @@ -30,13 +30,16 @@ #include "program/hash_table.h" extern "C" { -#include "brw_vs.h" #include "brw_context.h" #include "brw_eu.h" }; #include "glsl/ir.h" +struct brw_vec4_compile; +struct brw_vs_compile; +struct brw_vec4_prog_key; + namespace brw { class dst_reg; diff --git a/src/mesa/drivers/dri/i965/brw_vec4_reg_allocate.cpp b/src/mesa/drivers/dri/i965/brw_vec4_reg_allocate.cpp index 10a9c573307..0b27383777f 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4_reg_allocate.cpp +++ b/src/mesa/drivers/dri/i965/brw_vec4_reg_allocate.cpp @@ -27,6 +27,7 @@ extern "C" { } /* extern "C" */ #include "brw_vec4.h" +#include "brw_vs.h" using namespace brw; diff --git a/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp b/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp index 455d9dcb12c..c3070495da1 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp +++ b/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp @@ -22,6 +22,7 @@ */ #include "brw_vec4.h" +#include "brw_vs.h" #include "glsl/ir_uniform.h" extern "C" { #include "main/context.h" diff --git a/src/mesa/drivers/dri/i965/brw_vec4_vp.cpp b/src/mesa/drivers/dri/i965/brw_vec4_vp.cpp index eedf59bc2ee..1787df8f25d 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4_vp.cpp +++ b/src/mesa/drivers/dri/i965/brw_vec4_vp.cpp @@ -29,6 +29,7 @@ #include "brw_context.h" #include "brw_vec4.h" +#include "brw_vs.h" extern "C" { #include "program/prog_parameter.h" #include "program/prog_print.h" diff --git a/src/mesa/drivers/dri/i965/test_vec4_register_coalesce.cpp b/src/mesa/drivers/dri/i965/test_vec4_register_coalesce.cpp index 6e8391b63cb..e1413053115 100644 --- a/src/mesa/drivers/dri/i965/test_vec4_register_coalesce.cpp +++ b/src/mesa/drivers/dri/i965/test_vec4_register_coalesce.cpp @@ -23,6 +23,7 @@ #include #include "brw_vec4.h" +#include "brw_vs.h" using namespace brw; -- 2.30.2