i965: Reduce cross-pollination between the DRI driver and compiler

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
2026-01-03 13:40:11 +01:00 · 2017-03-01 08:58:43 -08:00 · 2017-03-01 08:58:43 -08:00 · 8048c1953c
commit 8048c1953c
parent a2195e561a
57 changed files with 34 additions and 52 deletions
--- a/src/intel/blorp/blorp_blit.c
+++ b/src/intel/blorp/blorp_blit.c
@ -24,7 +24,6 @@
 #include "compiler/nir/nir_builder.h"

 #include "blorp_priv.h"
-#include "brw_meta_util.h"

 /* header-only include needed for _mesa_unorm_to_float and friends. */
 #include "mesa/main/format_utils.h"
--- a/src/intel/tools/disasm.c
+++ b/src/intel/tools/disasm.c
@ -23,7 +23,6 @@

 #include <stdlib.h>

-#include "brw_context.h"
 #include "brw_inst.h"
 #include "brw_eu.h"

--- a/src/mesa/drivers/dri/i965/brw_clip.c
+++ b/src/mesa/drivers/dri/i965/brw_clip.c
@ -36,7 +36,6 @@

 #include "brw_defines.h"
 #include "brw_context.h"
-#include "brw_eu.h"
 #include "brw_util.h"
 #include "brw_state.h"
 #include "brw_clip.h"
--- a/src/mesa/drivers/dri/i965/brw_clip_line.c
+++ b/src/mesa/drivers/dri/i965/brw_clip_line.c
@ -37,7 +37,6 @@

 #include "brw_defines.h"
 #include "brw_context.h"
-#include "brw_eu.h"
 #include "brw_clip.h"


--- a/src/mesa/drivers/dri/i965/brw_clip_point.c
+++ b/src/mesa/drivers/dri/i965/brw_clip_point.c
@ -37,7 +37,6 @@

 #include "brw_defines.h"
 #include "brw_context.h"
-#include "brw_eu.h"
 #include "brw_clip.h"


--- a/src/mesa/drivers/dri/i965/brw_clip_tri.c
+++ b/src/mesa/drivers/dri/i965/brw_clip_tri.c
@ -37,7 +37,6 @@

 #include "brw_defines.h"
 #include "brw_context.h"
-#include "brw_eu.h"
 #include "brw_clip.h"

 static void release_tmps( struct brw_clip_compile *c )
--- a/src/mesa/drivers/dri/i965/brw_clip_unfilled.c
+++ b/src/mesa/drivers/dri/i965/brw_clip_unfilled.c
@ -37,7 +37,6 @@

 #include "brw_defines.h"
 #include "brw_context.h"
-#include "brw_eu.h"
 #include "brw_clip.h"


--- a/src/mesa/drivers/dri/i965/brw_clip_util.c
+++ b/src/mesa/drivers/dri/i965/brw_clip_util.c
@ -38,7 +38,6 @@

 #include "brw_defines.h"
 #include "brw_context.h"
-#include "brw_eu.h"
 #include "brw_clip.h"


--- a/src/mesa/drivers/dri/i965/brw_compiler.c
+++ b/src/mesa/drivers/dri/i965/brw_compiler.c
@ -22,8 +22,8 @@
 */

 #include "brw_compiler.h"
-#include "brw_context.h"
 #include "brw_shader.h"
+#include "intel_debug.h"
 #include "compiler/nir/nir.h"
 #include "main/errors.h"
 #include "util/debug.h"
--- a/src/mesa/drivers/dri/i965/brw_context.c
+++ b/src/mesa/drivers/dri/i965/brw_context.c
@ -53,7 +53,6 @@
 #include "brw_context.h"
 #include "brw_defines.h"
 #include "brw_blorp.h"
-#include "brw_compiler.h"
 #include "brw_draw.h"
 #include "brw_state.h"

--- a/src/mesa/drivers/dri/i965/brw_cs.c
+++ b/src/mesa/drivers/dri/i965/brw_cs.c
@ -24,9 +24,7 @@
 #include "util/ralloc.h"
 #include "brw_context.h"
 #include "brw_cs.h"
-#include "brw_eu.h"
 #include "brw_wm.h"
-#include "brw_shader.h"
 #include "intel_mipmap_tree.h"
 #include "brw_state.h"
 #include "intel_batchbuffer.h"
--- a/src/mesa/drivers/dri/i965/brw_defines.h
+++ b/src/mesa/drivers/dri/i965/brw_defines.h
@ -29,6 +29,8 @@
  *   Keith Whitwell <keithw@vmware.com>
  */

+#include "util/macros.h"
+
 #define INTEL_MASK(high, low) (((1u<<((high)-(low)+1))-1)<<(low))
 /* Using the GNU statement expression extension */
 #define SET_FIELD(value, field)                                         \
--- a/src/mesa/drivers/dri/i965/brw_disasm.c
+++ b/src/mesa/drivers/dri/i965/brw_disasm.c
@ -24,8 +24,9 @@
 #include <string.h>
 #include <stdarg.h>

-#include "brw_context.h"
 #include "brw_defines.h"
+#include "brw_inst.h"
+#include "brw_shader.h"
 #include "brw_reg.h"
 #include "brw_inst.h"
 #include "brw_eu.h"
--- a/src/mesa/drivers/dri/i965/brw_draw.c
+++ b/src/mesa/drivers/dri/i965/brw_draw.c
@ -45,7 +45,6 @@
 #include "brw_defines.h"
 #include "brw_context.h"
 #include "brw_state.h"
-#include "brw_vs.h"

 #include "intel_batchbuffer.h"
 #include "intel_buffers.h"
--- a/src/mesa/drivers/dri/i965/brw_eu.c
+++ b/src/mesa/drivers/dri/i965/brw_eu.c
@ -30,9 +30,10 @@
  */


-#include "brw_context.h"
 #include "brw_defines.h"
 #include "brw_eu.h"
+#include "brw_shader.h"
+#include "intel_debug.h"

 #include "util/ralloc.h"

--- a/src/mesa/drivers/dri/i965/brw_eu_compact.c
+++ b/src/mesa/drivers/dri/i965/brw_eu_compact.c
@ -72,9 +72,10 @@
 * Gen 8 adds support for compacting 3-src instructions.
 */

-#include "brw_context.h"
 #include "brw_eu.h"
+#include "brw_shader.h"
 #include "intel_asm_annotation.h"
+#include "intel_debug.h"
 #include "util/u_atomic.h" /* for p_atomic_cmpxchg */

 static const uint32_t g45_control_index_table[32] = {
--- a/src/mesa/drivers/dri/i965/brw_eu_emit.c
+++ b/src/mesa/drivers/dri/i965/brw_eu_emit.c
@ -30,7 +30,6 @@
  */


-#include "brw_context.h"
 #include "brw_defines.h"
 #include "brw_eu.h"

--- a/src/mesa/drivers/dri/i965/brw_eu_util.c
+++ b/src/mesa/drivers/dri/i965/brw_eu_util.c
@ -30,7 +30,6 @@
  */


-#include "brw_context.h"
 #include "brw_defines.h"
 #include "brw_eu.h"

--- a/src/mesa/drivers/dri/i965/brw_ff_gs.c
+++ b/src/mesa/drivers/dri/i965/brw_ff_gs.c
@ -37,7 +37,6 @@

 #include "brw_defines.h"
 #include "brw_context.h"
-#include "brw_eu.h"
 #include "brw_util.h"
 #include "brw_state.h"
 #include "brw_ff_gs.h"
--- a/src/mesa/drivers/dri/i965/brw_ff_gs_emit.c
+++ b/src/mesa/drivers/dri/i965/brw_ff_gs_emit.c
@ -38,7 +38,6 @@

 #include "brw_defines.h"
 #include "brw_context.h"
-#include "brw_eu.h"
 #include "brw_ff_gs.h"

 /**
--- a/src/mesa/drivers/dri/i965/brw_fs.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs.cpp
@ -29,7 +29,6 @@
 */

 #include "main/macros.h"
-#include "brw_context.h"
 #include "brw_eu.h"
 #include "brw_fs.h"
 #include "brw_cs.h"
@ -38,6 +37,7 @@
 #include "brw_cfg.h"
 #include "brw_program.h"
 #include "brw_dead_control_flow.h"
+#include "intel_debug.h"
 #include "compiler/glsl_types.h"
 #include "compiler/nir/nir_builder.h"
 #include "program/prog_parameter.h"
--- a/src/mesa/drivers/dri/i965/brw_fs_builder.h
+++ b/src/mesa/drivers/dri/i965/brw_fs_builder.h
@ -27,7 +27,6 @@

 #include "brw_ir_fs.h"
 #include "brw_shader.h"
-#include "brw_context.h"

 namespace brw {
   /**
--- a/src/mesa/drivers/dri/i965/brw_fs_surface_builder.h
+++ b/src/mesa/drivers/dri/i965/brw_fs_surface_builder.h
@ -26,7 +26,6 @@
 #define BRW_FS_SURFACE_BUILDER_H

 #include "brw_fs_builder.h"
-#include "brw_context.h"

 namespace brw {
   namespace surface_access {
--- a/src/mesa/drivers/dri/i965/brw_gs.c
+++ b/src/mesa/drivers/dri/i965/brw_gs.c
@ -29,7 +29,6 @@

 #include "brw_gs.h"
 #include "brw_context.h"
-#include "brw_vec4_gs_visitor.h"
 #include "brw_state.h"
 #include "brw_ff_gs.h"
 #include "brw_nir.h"
--- a/src/mesa/drivers/dri/i965/brw_inst.h
+++ b/src/mesa/drivers/dri/i965/brw_inst.h
@ -33,7 +33,8 @@

 #include <stdint.h>

-#include "brw_context.h"
+#include "brw_defines.h"
+#include "common/gen_device_info.h"

 #ifdef __cplusplus
 extern "C" {
--- a/src/mesa/drivers/dri/i965/brw_interpolation_map.c
+++ b/src/mesa/drivers/dri/i965/brw_interpolation_map.c
@ -22,7 +22,6 @@
 */

 #include "brw_compiler.h"
-#include "brw_context.h"
 #include "compiler/nir/nir.h"

 static char const *get_qual_name(int mode)
--- a/src/mesa/drivers/dri/i965/brw_ir_vec4.h
+++ b/src/mesa/drivers/dri/i965/brw_ir_vec4.h
@ -26,7 +26,6 @@
 #define BRW_IR_VEC4_H

 #include "brw_shader.h"
-#include "brw_context.h"

 namespace brw {

--- a/src/mesa/drivers/dri/i965/brw_link.cpp
+++ b/src/mesa/drivers/dri/i965/brw_link.cpp
@ -22,8 +22,6 @@
 */

 #include "brw_context.h"
-#include "brw_shader.h"
-#include "brw_fs.h"
 #include "brw_nir.h"
 #include "brw_program.h"
 #include "compiler/glsl/ir.h"
--- a/src/mesa/drivers/dri/i965/brw_nir.c
+++ b/src/mesa/drivers/dri/i965/brw_nir.c
@ -23,6 +23,7 @@

 #include "brw_nir.h"
 #include "brw_shader.h"
+#include "intel_debug.h"
 #include "compiler/glsl_types.h"
 #include "compiler/nir/nir_builder.h"

--- a/src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp
+++ b/src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp
@ -21,8 +21,8 @@
 * IN THE SOFTWARE.
 */

-#include "brw_shader.h"
 #include "brw_nir.h"
+#include "brw_shader.h"
 #include "compiler/glsl/ir_uniform.h"

 static void
--- a/src/mesa/drivers/dri/i965/brw_program.c
+++ b/src/mesa/drivers/dri/i965/brw_program.c
@ -43,7 +43,6 @@

 #include "brw_program.h"
 #include "brw_context.h"
-#include "brw_shader.h"
 #include "brw_nir.h"
 #include "intel_batchbuffer.h"

--- a/src/mesa/drivers/dri/i965/brw_program_cache.c
+++ b/src/mesa/drivers/dri/i965/brw_program_cache.c
@ -47,11 +47,11 @@
 #include "main/imports.h"
 #include "intel_batchbuffer.h"
 #include "brw_state.h"
-#include "brw_vs.h"
 #include "brw_wm.h"
 #include "brw_gs.h"
 #include "brw_cs.h"
 #include "brw_program.h"
+#include "brw_eu.h"

 #define FILE_DEBUG_FLAG DEBUG_STATE

--- a/src/mesa/drivers/dri/i965/brw_sf.c
+++ b/src/mesa/drivers/dri/i965/brw_sf.c
@ -39,7 +39,6 @@

 #include "brw_defines.h"
 #include "brw_context.h"
-#include "brw_eu.h"
 #include "brw_util.h"
 #include "brw_sf.h"
 #include "brw_state.h"
--- a/src/mesa/drivers/dri/i965/brw_sf_emit.c
+++ b/src/mesa/drivers/dri/i965/brw_sf_emit.c
@ -37,7 +37,6 @@

 #include "brw_defines.h"
 #include "brw_context.h"
-#include "brw_eu.h"
 #include "brw_util.h"
 #include "brw_sf.h"

--- a/src/mesa/drivers/dri/i965/brw_shader.cpp
+++ b/src/mesa/drivers/dri/i965/brw_shader.cpp
@ -21,13 +21,14 @@
 * IN THE SOFTWARE.
 */

-#include "brw_context.h"
 #include "brw_cfg.h"
 #include "brw_eu.h"
 #include "brw_fs.h"
 #include "brw_nir.h"
 #include "brw_vec4_tes.h"
+#include "intel_debug.h"
 #include "main/uniforms.h"
+#include "util/macros.h"

 enum brw_reg_type
 brw_type_for_base_type(const struct glsl_type *type)
--- a/src/mesa/drivers/dri/i965/brw_shader.h
+++ b/src/mesa/drivers/dri/i965/brw_shader.h
@ -25,8 +25,9 @@

 #include <stdint.h>
 #include "brw_reg.h"
+#include "brw_compiler.h"
 #include "brw_defines.h"
-#include "brw_context.h"
+#include "brw_inst.h"
 #include "compiler/nir/nir.h"

 #ifdef __cplusplus
--- a/src/mesa/drivers/dri/i965/brw_state_dump.c
+++ b/src/mesa/drivers/dri/i965/brw_state_dump.c
@ -32,7 +32,6 @@

 #include "brw_context.h"
 #include "brw_defines.h"
-#include "brw_eu.h"
 #include "brw_state.h"

 static const char *sampler_mip_filter[] = {
--- a/src/mesa/drivers/dri/i965/brw_state_upload.c
+++ b/src/mesa/drivers/dri/i965/brw_state_upload.c
@ -33,6 +33,7 @@

 #include "brw_context.h"
 #include "brw_state.h"
+#include "brw_program.h"
 #include "drivers/common/meta.h"
 #include "intel_batchbuffer.h"
 #include "intel_buffers.h"
--- a/src/mesa/drivers/dri/i965/brw_tcs.c
+++ b/src/mesa/drivers/dri/i965/brw_tcs.c
@ -30,7 +30,6 @@
 #include "brw_context.h"
 #include "brw_nir.h"
 #include "brw_program.h"
-#include "brw_shader.h"
 #include "brw_state.h"
 #include "program/prog_parameter.h"
 #include "nir_builder.h"
--- a/src/mesa/drivers/dri/i965/brw_tes.c
+++ b/src/mesa/drivers/dri/i965/brw_tes.c
@ -30,7 +30,6 @@
 #include "brw_context.h"
 #include "brw_nir.h"
 #include "brw_program.h"
-#include "brw_shader.h"
 #include "brw_state.h"
 #include "program/prog_parameter.h"

--- a/src/mesa/drivers/dri/i965/brw_vec4.cpp
+++ b/src/mesa/drivers/dri/i965/brw_vec4.cpp
@ -29,6 +29,7 @@
 #include "brw_vec4_live_variables.h"
 #include "brw_vec4_vs.h"
 #include "brw_dead_control_flow.h"
+#include "intel_debug.h"
 #include "program/prog_parameter.h"

 #define MAX_INSTRUCTION (1 << 30)
--- a/src/mesa/drivers/dri/i965/brw_vec4_builder.h
+++ b/src/mesa/drivers/dri/i965/brw_vec4_builder.h
@ -27,7 +27,6 @@

 #include "brw_ir_vec4.h"
 #include "brw_ir_allocator.h"
-#include "brw_context.h"

 namespace brw {
   /**
--- a/src/mesa/drivers/dri/i965/brw_vec4_generator.cpp
+++ b/src/mesa/drivers/dri/i965/brw_vec4_generator.cpp
@ -24,6 +24,7 @@
 #include "brw_cfg.h"
 #include "brw_eu.h"
 #include "brw_program.h"
+#include "intel_debug.h"

 using namespace brw;

--- a/src/mesa/drivers/dri/i965/brw_vec4_gs_visitor.cpp
+++ b/src/mesa/drivers/dri/i965/brw_vec4_gs_visitor.cpp
@ -31,6 +31,7 @@
 #include "gen6_gs_visitor.h"
 #include "brw_fs.h"
 #include "brw_nir.h"
+#include "intel_debug.h"

 namespace brw {

--- a/src/mesa/drivers/dri/i965/brw_vec4_tcs.cpp
+++ b/src/mesa/drivers/dri/i965/brw_vec4_tcs.cpp
@ -30,6 +30,7 @@
 #include "brw_nir.h"
 #include "brw_vec4_tcs.h"
 #include "brw_fs.h"
+#include "intel_debug.h"

 namespace brw {

--- a/src/mesa/drivers/dri/i965/brw_vec4_tes.cpp
+++ b/src/mesa/drivers/dri/i965/brw_vec4_tes.cpp
@ -29,6 +29,7 @@

 #include "brw_vec4_tes.h"
 #include "brw_cfg.h"
+#include "intel_debug.h"

 namespace brw {

--- a/src/mesa/drivers/dri/i965/brw_vec4_vs_visitor.cpp
+++ b/src/mesa/drivers/dri/i965/brw_vec4_vs_visitor.cpp
@ -23,7 +23,7 @@


 #include "brw_vec4_vs.h"
-
+#include "intel_debug.h"

 namespace brw {

--- a/src/mesa/drivers/dri/i965/brw_vs.h
+++ b/src/mesa/drivers/dri/i965/brw_vs.h
@ -33,8 +33,7 @@
 #ifndef BRW_VS_H
 #define BRW_VS_H

-
-#include "brw_vec4.h"
+#include "brw_context.h"

 #ifdef __cplusplus
 extern "C" {
--- a/src/mesa/drivers/dri/i965/brw_vue_map.c
+++ b/src/mesa/drivers/dri/i965/brw_vue_map.c
@ -40,7 +40,8 @@
 */


-#include "brw_context.h"
+#include "brw_compiler.h"
+#include "intel_debug.h"

 static inline void
 assign_vue_slot(struct brw_vue_map *vue_map, int varying, int slot)
--- a/src/mesa/drivers/dri/i965/brw_wm.c
+++ b/src/mesa/drivers/dri/i965/brw_wm.c
@ -26,7 +26,6 @@
 #include "brw_context.h"
 #include "brw_wm.h"
 #include "brw_state.h"
-#include "brw_shader.h"
 #include "main/enums.h"
 #include "main/formats.h"
 #include "main/fbobject.h"
--- a/src/mesa/drivers/dri/i965/brw_wm.h
+++ b/src/mesa/drivers/dri/i965/brw_wm.h
@ -36,7 +36,6 @@
 #include <stdbool.h>

 #include "brw_context.h"
-#include "brw_eu.h"

 #ifdef __cplusplus
 extern "C" {
--- a/src/mesa/drivers/dri/i965/gen7_cs_state.c
+++ b/src/mesa/drivers/dri/i965/gen7_cs_state.c
@ -23,10 +23,9 @@

 #include "util/ralloc.h"
 #include "brw_context.h"
+#include "brw_defines.h"
 #include "brw_cs.h"
-#include "brw_eu.h"
 #include "brw_wm.h"
-#include "brw_shader.h"
 #include "intel_mipmap_tree.h"
 #include "intel_batchbuffer.h"
 #include "brw_state.h"
--- a/src/mesa/drivers/dri/i965/intel_debug.h
+++ b/src/mesa/drivers/dri/i965/intel_debug.h
@ -24,6 +24,9 @@
 */
 #pragma once

+#include <stdint.h>
+#include "compiler/shader_enums.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
--- a/src/mesa/drivers/dri/i965/intel_screen.c
+++ b/src/mesa/drivers/dri/i965/intel_screen.c
@ -35,7 +35,7 @@
 #include "main/version.h"
 #include "swrast/s_renderbuffer.h"
 #include "util/ralloc.h"
-#include "brw_shader.h"
+#include "brw_defines.h"
 #include "compiler/nir/nir.h"

 #include "utils.h"
--- a/src/mesa/drivers/dri/i965/test_eu_compact.c
+++ b/src/mesa/drivers/dri/i965/test_eu_compact.c
@ -25,7 +25,6 @@
 #include <stdio.h>
 #include <stdbool.h>
 #include "util/ralloc.h"
-#include "brw_context.h"
 #include "brw_eu.h"

 static bool
--- a/src/mesa/drivers/dri/i965/test_vec4_copy_propagation.cpp
+++ b/src/mesa/drivers/dri/i965/test_vec4_copy_propagation.cpp
@ -23,7 +23,6 @@

 #include <gtest/gtest.h>
 #include "brw_vec4.h"
-#include "brw_vs.h"
 #include "program/program.h"

 using namespace brw;
--- a/src/mesa/drivers/dri/i965/test_vec4_register_coalesce.cpp
+++ b/src/mesa/drivers/dri/i965/test_vec4_register_coalesce.cpp
@ -23,7 +23,6 @@

 #include <gtest/gtest.h>
 #include "brw_vec4.h"
-#include "brw_vs.h"
 #include "program/program.h"

 using namespace brw;