intel/compiler: Reverse inclusion dependency between brw_fs_live_variables.h and brw_fs.h

brw_fs.h (in particular fs_visitor) is logically a user of the live
variables analysis pass, not the other way around.
brw_fs_live_variables.h requires the definition of some FS IR data
structures to compile, but those can be obtained directly from
brw_ir_fs.h without including brw_fs.h.  The dependency of
fs_live_variables on fs_visitor is rather accidental and will be
removed in a future commit, a forward declaration is enough for the
moment.

Reviewed-by: Matt Turner <mattst88@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4012>
This commit is contained in:
Francisco Jerez
2016-03-09 17:03:57 -08:00
committed by Matt Turner
parent 06c5c49646
commit a6fc88e91b
3 changed files with 4 additions and 3 deletions

View File

@@ -31,6 +31,7 @@
#include "brw_shader.h"
#include "brw_ir_fs.h"
#include "brw_fs_builder.h"
#include "brw_fs_live_variables.h"
#include "compiler/nir/nir.h"
struct bblock_t;
@@ -39,7 +40,6 @@ namespace {
}
namespace brw {
class fs_live_variables;
}
struct brw_gs_compile;

View File

@@ -25,7 +25,7 @@
*
*/
#include "brw_cfg.h"
#include "brw_fs.h"
#include "brw_fs_live_variables.h"
using namespace brw;

View File

@@ -28,10 +28,11 @@
#ifndef BRW_FS_LIVE_VARIABLES_H
#define BRW_FS_LIVE_VARIABLES_H
#include "brw_fs.h"
#include "brw_ir_fs.h"
#include "util/bitset.h"
struct cfg_t;
class fs_visitor;
namespace brw {