intel/common: move gen_debug to intel/dev
libintel_common depends on libintel_compiler, but it contains debug functionality that is needed by libintel_compiler. Break the circular dependency by moving gen_debug files to libintel_dev. Suggested-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
parent
03d6d01fe2
commit
2393cc7f00
|
@ -55,7 +55,7 @@
|
|||
#define ETIME ETIMEDOUT
|
||||
#endif
|
||||
#include "common/gen_clflush.h"
|
||||
#include "common/gen_debug.h"
|
||||
#include "dev/gen_debug.h"
|
||||
#include "common/gen_gem.h"
|
||||
#include "dev/gen_device_info.h"
|
||||
#include "main/macros.h"
|
||||
|
|
|
@ -27,7 +27,7 @@
|
|||
#include "pipe/p_state.h"
|
||||
#include "util/u_debug.h"
|
||||
#include "intel/blorp/blorp.h"
|
||||
#include "intel/common/gen_debug.h"
|
||||
#include "intel/dev/gen_debug.h"
|
||||
#include "intel/compiler/brw_compiler.h"
|
||||
#include "iris_batch.h"
|
||||
#include "iris_binder.h"
|
||||
|
|
|
@ -46,7 +46,7 @@
|
|||
#include "iris_context.h"
|
||||
#include "iris_resource.h"
|
||||
#include "iris_screen.h"
|
||||
#include "intel/common/gen_debug.h"
|
||||
#include "intel/dev/gen_debug.h"
|
||||
#include "isl/isl.h"
|
||||
#include "drm-uapi/drm_fourcc.h"
|
||||
#include "drm-uapi/i915_drm.h"
|
||||
|
|
|
@ -10,8 +10,6 @@ BLORP_FILES = \
|
|||
COMMON_FILES = \
|
||||
common/gen_clflush.h \
|
||||
common/gen_batch_decoder.c \
|
||||
common/gen_debug.c \
|
||||
common/gen_debug.h \
|
||||
common/gen_decoder.c \
|
||||
common/gen_decoder.h \
|
||||
common/gen_disasm.c \
|
||||
|
@ -127,6 +125,8 @@ COMPILER_GENERATED_FILES = \
|
|||
compiler/brw_nir_trig_workarounds.c
|
||||
|
||||
DEV_FILES = \
|
||||
dev/gen_debug.c \
|
||||
dev/gen_debug.h \
|
||||
dev/gen_device_info.c \
|
||||
dev/gen_device_info.h
|
||||
|
||||
|
|
|
@ -23,8 +23,6 @@
|
|||
files_libintel_common = files(
|
||||
'gen_clflush.h',
|
||||
'gen_batch_decoder.c',
|
||||
'gen_debug.c',
|
||||
'gen_debug.h',
|
||||
'gen_decoder.c',
|
||||
'gen_decoder.h',
|
||||
'gen_disasm.c',
|
||||
|
|
|
@ -23,7 +23,7 @@
|
|||
|
||||
#include "brw_clip.h"
|
||||
|
||||
#include "common/gen_debug.h"
|
||||
#include "dev/gen_debug.h"
|
||||
|
||||
const unsigned *
|
||||
brw_compile_clip(const struct brw_compiler *compiler,
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
#include "brw_compiler.h"
|
||||
#include "brw_eu.h"
|
||||
|
||||
#include "common/gen_debug.h"
|
||||
#include "dev/gen_debug.h"
|
||||
|
||||
struct brw_sf_compile {
|
||||
struct brw_codegen func;
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
#include "brw_compiler.h"
|
||||
#include "brw_shader.h"
|
||||
#include "brw_eu.h"
|
||||
#include "common/gen_debug.h"
|
||||
#include "dev/gen_debug.h"
|
||||
#include "compiler/nir/nir.h"
|
||||
#include "main/errors.h"
|
||||
#include "util/debug.h"
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
#include "brw_cfg.h"
|
||||
#include "brw_eu.h"
|
||||
#include "brw_disasm_info.h"
|
||||
#include "common/gen_debug.h"
|
||||
#include "dev/gen_debug.h"
|
||||
#include "compiler/nir/nir.h"
|
||||
|
||||
__attribute__((weak)) void nir_print_instr(UNUSED const nir_instr *instr,
|
||||
|
|
|
@ -33,7 +33,7 @@
|
|||
#include "brw_eu_defines.h"
|
||||
#include "brw_eu.h"
|
||||
#include "brw_shader.h"
|
||||
#include "common/gen_debug.h"
|
||||
#include "dev/gen_debug.h"
|
||||
|
||||
#include "util/ralloc.h"
|
||||
|
||||
|
|
|
@ -75,7 +75,7 @@
|
|||
#include "brw_eu.h"
|
||||
#include "brw_shader.h"
|
||||
#include "brw_disasm_info.h"
|
||||
#include "common/gen_debug.h"
|
||||
#include "dev/gen_debug.h"
|
||||
|
||||
static const uint32_t g45_control_index_table[32] = {
|
||||
0b00000000000000000,
|
||||
|
|
|
@ -35,7 +35,7 @@
|
|||
#include "brw_vec4_gs_visitor.h"
|
||||
#include "brw_cfg.h"
|
||||
#include "brw_dead_control_flow.h"
|
||||
#include "common/gen_debug.h"
|
||||
#include "dev/gen_debug.h"
|
||||
#include "compiler/glsl_types.h"
|
||||
#include "compiler/nir/nir_builder.h"
|
||||
#include "program/prog_parameter.h"
|
||||
|
|
|
@ -23,7 +23,7 @@
|
|||
|
||||
#include "brw_nir.h"
|
||||
#include "brw_shader.h"
|
||||
#include "common/gen_debug.h"
|
||||
#include "dev/gen_debug.h"
|
||||
#include "compiler/glsl_types.h"
|
||||
#include "compiler/nir/nir_builder.h"
|
||||
#include "util/u_math.h"
|
||||
|
|
|
@ -26,7 +26,7 @@
|
|||
#include "brw_fs.h"
|
||||
#include "brw_nir.h"
|
||||
#include "brw_vec4_tes.h"
|
||||
#include "common/gen_debug.h"
|
||||
#include "dev/gen_debug.h"
|
||||
#include "main/uniforms.h"
|
||||
#include "util/macros.h"
|
||||
|
||||
|
|
|
@ -29,7 +29,7 @@
|
|||
#include "brw_vec4_live_variables.h"
|
||||
#include "brw_vec4_vs.h"
|
||||
#include "brw_dead_control_flow.h"
|
||||
#include "common/gen_debug.h"
|
||||
#include "dev/gen_debug.h"
|
||||
#include "program/prog_parameter.h"
|
||||
#include "util/u_math.h"
|
||||
|
||||
|
|
|
@ -23,7 +23,7 @@
|
|||
#include "brw_vec4.h"
|
||||
#include "brw_cfg.h"
|
||||
#include "brw_eu.h"
|
||||
#include "common/gen_debug.h"
|
||||
#include "dev/gen_debug.h"
|
||||
|
||||
using namespace brw;
|
||||
|
||||
|
|
|
@ -32,7 +32,7 @@
|
|||
#include "brw_cfg.h"
|
||||
#include "brw_fs.h"
|
||||
#include "brw_nir.h"
|
||||
#include "common/gen_debug.h"
|
||||
#include "dev/gen_debug.h"
|
||||
|
||||
namespace brw {
|
||||
|
||||
|
|
|
@ -30,7 +30,7 @@
|
|||
#include "brw_nir.h"
|
||||
#include "brw_vec4_tcs.h"
|
||||
#include "brw_fs.h"
|
||||
#include "common/gen_debug.h"
|
||||
#include "dev/gen_debug.h"
|
||||
|
||||
namespace brw {
|
||||
|
||||
|
|
|
@ -29,7 +29,7 @@
|
|||
|
||||
#include "brw_vec4_tes.h"
|
||||
#include "brw_cfg.h"
|
||||
#include "common/gen_debug.h"
|
||||
#include "dev/gen_debug.h"
|
||||
|
||||
namespace brw {
|
||||
|
||||
|
|
|
@ -23,7 +23,7 @@
|
|||
|
||||
|
||||
#include "brw_vec4_vs.h"
|
||||
#include "common/gen_debug.h"
|
||||
#include "dev/gen_debug.h"
|
||||
|
||||
namespace brw {
|
||||
|
||||
|
|
|
@ -41,7 +41,7 @@
|
|||
|
||||
|
||||
#include "brw_compiler.h"
|
||||
#include "common/gen_debug.h"
|
||||
#include "dev/gen_debug.h"
|
||||
|
||||
static inline void
|
||||
assign_vue_slot(struct brw_vue_map *vue_map, int varying, int slot)
|
||||
|
|
|
@ -31,7 +31,7 @@
|
|||
|
||||
#include <stdlib.h>
|
||||
|
||||
#include "common/gen_debug.h"
|
||||
#include "dev/gen_debug.h"
|
||||
#include "util/macros.h"
|
||||
#include "util/debug.h"
|
||||
#include "c11/threads.h"
|
|
@ -21,6 +21,8 @@
|
|||
# TODO: android?
|
||||
|
||||
files_libintel_dev = files(
|
||||
'gen_debug.c',
|
||||
'gen_debug.h',
|
||||
'gen_device_info.c',
|
||||
'gen_device_info.h',
|
||||
)
|
||||
|
|
|
@ -83,7 +83,7 @@ struct gen_l3_config;
|
|||
#include "anv_extensions.h"
|
||||
#include "isl/isl.h"
|
||||
|
||||
#include "common/gen_debug.h"
|
||||
#include "dev/gen_debug.h"
|
||||
#include "common/intel_log.h"
|
||||
#include "wsi_common.h"
|
||||
|
||||
|
|
|
@ -38,7 +38,7 @@
|
|||
#include "brw_state.h"
|
||||
#include "intel_buffer_objects.h"
|
||||
#include "intel_fbo.h"
|
||||
#include "common/gen_debug.h"
|
||||
#include "dev/gen_debug.h"
|
||||
|
||||
#define FILE_DEBUG_FLAG DEBUG_BLORP
|
||||
|
||||
|
|
|
@ -53,7 +53,7 @@
|
|||
#define ETIME ETIMEDOUT
|
||||
#endif
|
||||
#include "common/gen_clflush.h"
|
||||
#include "common/gen_debug.h"
|
||||
#include "dev/gen_debug.h"
|
||||
#include "common/gen_gem.h"
|
||||
#include "dev/gen_device_info.h"
|
||||
#include "libdrm_macros.h"
|
||||
|
|
|
@ -46,7 +46,7 @@
|
|||
|
||||
#include <brw_bufmgr.h>
|
||||
|
||||
#include "common/gen_debug.h"
|
||||
#include "dev/gen_debug.h"
|
||||
#include "common/gen_decoder.h"
|
||||
#include "intel_screen.h"
|
||||
#include "intel_tex_obj.h"
|
||||
|
|
|
@ -32,7 +32,7 @@
|
|||
#include "util/mesa-sha1.h"
|
||||
|
||||
#include "compiler/brw_eu.h"
|
||||
#include "common/gen_debug.h"
|
||||
#include "dev/gen_debug.h"
|
||||
|
||||
#include "brw_context.h"
|
||||
#include "brw_program.h"
|
||||
|
|
Loading…
Reference in New Issue