Commit f36993b4 authored by Matt Turner's avatar Matt Turner

i965: Clean up #includes in the compiler.

Reviewed-by: default avatarIan Romanick <ian.d.romanick@intel.com>
parent 1eb11e64
......@@ -26,7 +26,6 @@
#include "intel_fbo.h"
#include "brw_blorp.h"
#include "brw_defines.h"
#include "brw_state.h"
#define FILE_DEBUG_FLAG DEBUG_BLORP
......
......@@ -25,7 +25,6 @@
#include <stdint.h>
#include "brw_context.h"
#include "brw_reg.h"
#include "intel_mipmap_tree.h"
......
......@@ -23,7 +23,6 @@
#include "main/teximage.h"
#include "main/fbobject.h"
#include "main/renderbuffer.h"
#include "intel_fbo.h"
......
......@@ -24,7 +24,6 @@
#ifndef BRW_BLORP_BLIT_EU_H
#define BRW_BLORP_BLIT_EU_H
#include "brw_context.h"
#include "brw_fs.h"
class brw_blorp_eu_emitter
......
......@@ -34,15 +34,11 @@
#define BRWCONTEXT_INC
#include <stdbool.h>
#include <string.h>
#include "main/imports.h"
#include "main/macros.h"
#include "main/mm.h"
#include "main/mtypes.h"
#include "brw_structs.h"
#include "brw_compiler.h"
#include "intel_aub.h"
#include "program/prog_parameter.h"
#ifdef __cplusplus
extern "C" {
......@@ -50,9 +46,7 @@ extern "C" {
#define virtual virt
#endif
#include <drm.h>
#include <intel_bufmgr.h>
#include <i915_drm.h>
#ifdef __cplusplus
#undef virtual
}
......
......@@ -32,6 +32,7 @@
#include "intel_batchbuffer.h"
#include "brw_nir.h"
#include "brw_program.h"
#include "glsl/ir_uniform.h"
void
brw_cs_fill_local_id_payload(const struct brw_cs_prog_data *prog_data,
......
......@@ -21,10 +21,7 @@
*/
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <getopt.h>
#include <unistd.h>
#include <stdarg.h>
#include "brw_context.h"
......
......@@ -35,11 +35,9 @@
#include <stdbool.h>
#include "brw_inst.h"
#include "brw_structs.h"
#include "brw_defines.h"
#include "brw_reg.h"
#include "intel_asm_annotation.h"
#include "program/prog_instruction.h"
#ifdef __cplusplus
extern "C" {
......
......@@ -28,19 +28,9 @@
* from the LIR.
*/
#include <sys/types.h>
#include "util/hash_table.h"
#include "main/macros.h"
#include "main/shaderobj.h"
#include "main/fbobject.h"
#include "program/prog_parameter.h"
#include "program/prog_print.h"
#include "util/register_allocate.h"
#include "program/hash_table.h"
#include "brw_context.h"
#include "brw_eu.h"
#include "brw_wm.h"
#include "brw_fs.h"
#include "brw_cs.h"
#include "brw_nir.h"
......@@ -48,10 +38,7 @@
#include "brw_cfg.h"
#include "brw_program.h"
#include "brw_dead_control_flow.h"
#include "main/uniforms.h"
#include "brw_fs_live_variables.h"
#include "glsl/nir/glsl_types.h"
#include "program/sampler.h"
using namespace brw;
......
......@@ -30,28 +30,8 @@
#include "brw_shader.h"
#include "brw_ir_fs.h"
#include "brw_fs_builder.h"
extern "C" {
#include <sys/types.h>
#include "main/macros.h"
#include "main/shaderobj.h"
#include "main/uniforms.h"
#include "program/prog_parameter.h"
#include "program/prog_print.h"
#include "program/prog_optimize.h"
#include "util/register_allocate.h"
#include "program/hash_table.h"
#include "brw_context.h"
#include "brw_eu.h"
#include "brw_wm.h"
#include "intel_asm_annotation.h"
}
#include "glsl/nir/glsl_types.h"
#include "glsl/ir.h"
#include "glsl/nir/nir.h"
#include "program/sampler.h"
struct bblock_t;
namespace {
......
......@@ -41,8 +41,6 @@
* we do retain the vector types in that case.
*/
#include "main/core.h"
#include "brw_wm.h"
#include "glsl/ir.h"
#include "glsl/ir_expression_flattening.h"
#include "glsl/nir/glsl_types.h"
......
......@@ -22,8 +22,8 @@
*/
#include "brw_fs.h"
#include "brw_fs_live_variables.h"
#include "brw_cfg.h"
#include "brw_eu.h"
/** @file brw_fs_cmod_propagation.cpp
*
......
......@@ -35,7 +35,6 @@
*/
#include "brw_fs.h"
#include "brw_fs_live_variables.h"
#include "brw_cfg.h"
using namespace brw;
......
......@@ -37,6 +37,7 @@
#include "util/bitset.h"
#include "brw_fs.h"
#include "brw_cfg.h"
#include "brw_eu.h"
namespace { /* avoid conflict with opt_copy_propagation_elements */
struct acp_entry : public exec_node {
......
......@@ -27,8 +27,6 @@
* native instructions.
*/
#include "main/macros.h"
#include "brw_context.h"
#include "brw_eu.h"
#include "brw_fs.h"
#include "brw_cfg.h"
......
......@@ -22,13 +22,9 @@
*/
#include "glsl/ir.h"
#include "glsl/ir_optimization.h"
#include "glsl/nir/glsl_to_nir.h"
#include "main/shaderimage.h"
#include "program/prog_to_nir.h"
#include "brw_fs.h"
#include "brw_fs_surface_builder.h"
#include "brw_vec4_gs_visitor.h"
#include "brw_nir.h"
#include "brw_program.h"
......
......@@ -28,8 +28,7 @@
#include "brw_eu.h"
#include "brw_fs.h"
#include "brw_cfg.h"
#include "glsl/nir/glsl_types.h"
#include "glsl/ir_optimization.h"
#include "util/register_allocate.h"
using namespace brw;
......
......@@ -37,10 +37,8 @@
* behavior we want for the results of texture lookups, but probably not for
*/
#include "main/core.h"
#include "brw_context.h"
#include "main/imports.h"
#include "glsl/ir.h"
#include "glsl/ir_visitor.h"
#include "glsl/ir_rvalue_visitor.h"
#include "glsl/nir/glsl_types.h"
#include "util/hash_table.h"
......
......@@ -27,26 +27,8 @@
* makes it easier to do backend-specific optimizations than doing so
* in the GLSL IR or in the native code.
*/
#include <sys/types.h>
#include "main/macros.h"
#include "main/shaderobj.h"
#include "program/prog_parameter.h"
#include "program/prog_print.h"
#include "program/prog_optimize.h"
#include "util/register_allocate.h"
#include "program/hash_table.h"
#include "brw_context.h"
#include "brw_eu.h"
#include "brw_wm.h"
#include "brw_cs.h"
#include "brw_vec4.h"
#include "brw_vec4_gs_visitor.h"
#include "brw_fs.h"
#include "main/uniforms.h"
#include "glsl/nir/glsl_types.h"
#include "glsl/ir_optimization.h"
#include "program/sampler.h"
using namespace brw;
......
......@@ -34,6 +34,7 @@
#include "brw_ff_gs.h"
#include "brw_nir.h"
#include "brw_program.h"
#include "glsl/ir_uniform.h"
static void
assign_gs_binding_table_offsets(const struct brw_device_info *devinfo,
......
......@@ -21,17 +21,16 @@
* IN THE SOFTWARE.
*/
#include "main/macros.h"
#include "brw_context.h"
#include "brw_vs.h"
#include "brw_gs.h"
#include "brw_shader.h"
#include "brw_fs.h"
#include "brw_cfg.h"
#include "brw_nir.h"
#include "brw_program.h"
#include "glsl/ir_optimization.h"
#include "glsl/glsl_parser_extras.h"
#include "program/program.h"
#include "main/shaderapi.h"
#include "main/uniforms.h"
/**
* Performs a compile of the shader stages even when we don't know
......
......@@ -23,7 +23,6 @@
#include "brw_nir.h"
#include "brw_shader.h"
#include "glsl/glsl_parser_extras.h"
#include "glsl/nir/glsl_to_nir.h"
#include "program/prog_to_nir.h"
......
......@@ -23,7 +23,6 @@
#include "brw_shader.h"
#include "brw_nir.h"
#include "glsl/ir.h"
#include "glsl/ir_uniform.h"
static void
......
......@@ -31,8 +31,6 @@
#include <pthread.h>
#include "main/imports.h"
#include "main/enums.h"
#include "main/shaderobj.h"
#include "program/prog_parameter.h"
#include "program/prog_print.h"
#include "program/program.h"
......@@ -45,7 +43,6 @@
#include "brw_context.h"
#include "brw_shader.h"
#include "brw_nir.h"
#include "brw_wm.h"
#include "intel_batchbuffer.h"
static unsigned
......
......@@ -30,8 +30,6 @@
#include "brw_vec4.h"
#include "brw_cfg.h"
#include "brw_shader.h"
#include "glsl/nir/glsl_types.h"
#include "glsl/ir_optimization.h"
using namespace brw;
......
......@@ -21,16 +21,13 @@
* IN THE SOFTWARE.
*/
#include "main/macros.h"
#include "brw_context.h"
#include "brw_vs.h"
#include "brw_gs.h"
#include "brw_fs.h"
#include "brw_cfg.h"
#include "brw_eu.h"
#include "brw_nir.h"
#include "glsl/ir_optimization.h"
#include "glsl/glsl_parser_extras.h"
#include "main/shaderapi.h"
#include "main/shaderobj.h"
#include "main/uniforms.h"
#include "util/debug.h"
static void
......
......@@ -21,20 +21,17 @@
* IN THE SOFTWARE.
*/
#pragma once
#include <stdint.h>
#include "brw_reg.h"
#include "brw_defines.h"
#include "brw_context.h"
#include "main/compiler.h"
#include "glsl/ir.h"
#include "program/prog_parameter.h"
#ifdef __cplusplus
#include "brw_ir_allocator.h"
#endif
#pragma once
#define MAX_SAMPLER_MESSAGE_SIZE 11
#define MAX_VGRF_SIZE 16
......
......@@ -20,13 +20,11 @@
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
* IN THE SOFTWARE.
*/
#include "main/context.h"
#include "main/mtypes.h"
#include "brw_context.h"
#include "brw_state.h"
#include "brw_defines.h"
#include "brw_wm.h"
struct surface_format_info {
bool exists;
......
......@@ -30,10 +30,6 @@
*/
#include <assert.h>
#include "main/mtypes.h"
#include "program/prog_parameter.h"
#include "brw_util.h"
#include "brw_defines.h"
......
......@@ -33,8 +33,6 @@
#ifndef BRW_UTIL_H
#define BRW_UTIL_H
#include "main/mtypes.h"
#include "main/imports.h"
#include "brw_context.h"
extern GLuint brw_translate_blend_factor( GLenum factor );
......
......@@ -28,14 +28,7 @@
#include "brw_nir.h"
#include "brw_vec4_live_variables.h"
#include "brw_dead_control_flow.h"
extern "C" {
#include "main/macros.h"
#include "main/shaderobj.h"
#include "program/prog_print.h"
#include "program/prog_parameter.h"
}
#include "main/context.h"
#define MAX_INSTRUCTION (1 << 30)
......
......@@ -24,23 +24,11 @@
#ifndef BRW_VEC4_H
#define BRW_VEC4_H
#include <stdint.h>
#include "brw_shader.h"
#include "main/compiler.h"
#include "program/hash_table.h"
#include "brw_program.h"
#ifdef __cplusplus
#include "brw_ir_vec4.h"
extern "C" {
#endif
#include "brw_context.h"
#include "brw_eu.h"
#include "intel_asm_annotation.h"
#ifdef __cplusplus
}; /* extern "C" */
#endif
#include "glsl/ir.h"
......
......@@ -31,6 +31,7 @@
#include "brw_vec4.h"
#include "brw_cfg.h"
#include "brw_eu.h"
namespace brw {
......
......@@ -31,9 +31,7 @@
#include "brw_vec4.h"
#include "brw_cfg.h"
extern "C" {
#include "main/macros.h"
}
#include "brw_eu.h"
namespace brw {
......
......@@ -23,6 +23,7 @@
#include "glsl/glsl_parser_extras.h"
#include "brw_vec4.h"
#include "brw_cfg.h"
#include "brw_eu.h"
#include "brw_program.h"
using namespace brw;
......
......@@ -21,7 +21,6 @@
* IN THE SOFTWARE.
*/
#include "brw_nir.h"
#include "brw_vec4_gs_visitor.h"
namespace brw {
......
......@@ -26,7 +26,6 @@
#include "brw_vec4_builder.h"
#include "brw_vec4_surface_builder.h"
#include "brw_program.h"
#include "glsl/ir_uniform.h"
using namespace brw;
using namespace brw::surface_access;
......
......@@ -21,10 +21,8 @@
* IN THE SOFTWARE.
*/
#include "main/macros.h"
#include "util/register_allocate.h"
#include "brw_vec4.h"
#include "brw_vs.h"
#include "brw_cfg.h"
using namespace brw;
......
......@@ -23,9 +23,8 @@
#include "brw_vec4.h"
#include "brw_cfg.h"
#include "brw_eu.h"
#include "brw_program.h"
#include "glsl/ir_uniform.h"
#include "program/sampler.h"
namespace brw {
......
......@@ -34,10 +34,7 @@
#define BRW_VS_H
#include "brw_context.h"
#include "brw_eu.h"
#include "brw_vec4.h"
#include "program/program.h"
/**
* The VF can't natively handle certain types of attributes, such as GL_FIXED
......
......@@ -40,7 +40,6 @@
*/
#include "main/compiler.h"
#include "brw_context.h"
static inline void
......
......@@ -35,7 +35,6 @@
#include <stdbool.h>
#include "program/prog_instruction.h"
#include "brw_context.h"
#include "brw_eu.h"
......
......@@ -30,8 +30,8 @@
*/
#include "main/mtypes.h"
#include "brw_fs.h"
#include "brw_wm.h"
#undef P /* prompted depth */
......
......@@ -36,6 +36,7 @@
#include "main/samplerobj.h"
#include "main/shaderimage.h"
#include "program/prog_parameter.h"
#include "program/prog_instruction.h"
#include "main/framebuffer.h"
#include "intel_mipmap_tree.h"
......
......@@ -24,11 +24,9 @@
#include <assert.h>
#include "intel_batchbuffer.h"
#include "intel_fbo.h"
#include "intel_mipmap_tree.h"
#include "brw_context.h"
#include "brw_defines.h"
#include "brw_state.h"
#include "brw_blorp.h"
......
......@@ -30,6 +30,7 @@
*/
#include "gen6_gs_visitor.h"
#include "brw_eu.h"
namespace brw {
......
......@@ -24,11 +24,9 @@
#include <assert.h>
#include "intel_batchbuffer.h"
#include "intel_fbo.h"
#include "intel_mipmap_tree.h"
#include "brw_context.h"
#include "brw_defines.h"
#include "brw_state.h"
#include "brw_blorp.h"
......
......@@ -30,6 +30,8 @@
#include "intel_mipmap_tree.h"
#include "intel_batchbuffer.h"
#include "brw_state.h"
#include "program/prog_statevars.h"
#include "glsl/ir_uniform.h"
static unsigned
get_cs_thread_count(const struct brw_cs_prog_data *cs_prog_data)
......
......@@ -26,6 +26,7 @@
#include "main/texformat.h"
#include "main/teximage.h"
#include "program/prog_parameter.h"
#include "program/prog_instruction.h"
#include "intel_mipmap_tree.h"
#include "intel_batchbuffer.h"
......
......@@ -27,6 +27,7 @@
#include "main/texformat.h"
#include "main/teximage.h"
#include "program/prog_parameter.h"
#include "program/prog_instruction.h"
#include "intel_mipmap_tree.h"
#include "intel_batchbuffer.h"
......
......@@ -31,7 +31,6 @@
#include "brw_context.h"
#include "intel_debug.h"
#include "utils.h"
#include "util/u_atomic.h" /* for p_atomic_cmpxchg */
#include "util/debug.h"
......
......@@ -27,8 +27,6 @@
#include "brw_context.h"
#include "intel_batchbuffer.h"
#include "intel_reg.h"
#include "utils.h"
/**
* Test if we can use MI_LOAD_REGISTER_MEM from an untrusted batchbuffer.
......
......@@ -23,7 +23,6 @@
#include "intel_resolve_map.h"
#include <assert.h>
#include <stdlib.h>
/**
......
......@@ -24,6 +24,7 @@
#include <gtest/gtest.h>
#include "brw_vec4.h"
#include "brw_vs.h"
#include "program/program.h"
using namespace brw;
......
......@@ -24,6 +24,7 @@
#include <gtest/gtest.h>
#include "brw_vec4.h"
#include "brw_vs.h"
#include "program/program.h"
using namespace brw;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment