intel/compiler: Reverse inclusion dependency between brw_cfg.h and brw_shader.h

This reflects the natural dependency relationship between brw_cfg.h
and brw_shader.h.  brw_cfg.h only requires the base IR definitions
which are now part of a separate header.

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 15:38:55 -08:00
committed by Matt Turner
parent d46fb2126d
commit 310aef6b59
4 changed files with 6 additions and 6 deletions

View File

@@ -26,6 +26,7 @@
*/ */
#include "brw_cfg.h" #include "brw_cfg.h"
#include "brw_shader.h"
/** @file brw_cfg.cpp /** @file brw_cfg.cpp
* *

View File

@@ -28,7 +28,7 @@
#ifndef BRW_CFG_H #ifndef BRW_CFG_H
#define BRW_CFG_H #define BRW_CFG_H
#include "brw_shader.h" #include "brw_ir.h"
struct bblock_t; struct bblock_t;
@@ -70,7 +70,8 @@ struct bblock_link {
enum bblock_link_kind kind; enum bblock_link_kind kind;
}; };
struct backend_instruction; struct backend_shader;
struct cfg_t;
struct bblock_t { struct bblock_t {
#ifdef __cplusplus #ifdef __cplusplus

View File

@@ -21,7 +21,7 @@
* IN THE SOFTWARE. * IN THE SOFTWARE.
*/ */
#include "brw_cfg.h" #include "brw_shader.h"
using namespace brw; using namespace brw;

View File

@@ -25,12 +25,10 @@
#define BRW_SHADER_H #define BRW_SHADER_H
#include <stdint.h> #include <stdint.h>
#include "brw_ir.h" #include "brw_cfg.h"
#include "brw_compiler.h" #include "brw_compiler.h"
#include "compiler/nir/nir.h" #include "compiler/nir/nir.h"
struct cfg_t;
#ifdef __cplusplus #ifdef __cplusplus
#include "brw_ir_allocator.h" #include "brw_ir_allocator.h"