From d6275ccf79667094de496d06aba35222be9935fc Mon Sep 17 00:00:00 2001 From: =?utf8?q?Nicolai=20H=C3=A4hnle?= Date: Tue, 21 Jul 2009 18:28:30 +0200 Subject: [PATCH] r300: Further reduce dependency between compiler and classic driver MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Nicolai Hähnle --- src/mesa/drivers/dri/r300/compiler/r300_fragprog.c | 4 ++-- src/mesa/drivers/dri/r300/compiler/r300_fragprog.h | 4 ++-- .../drivers/dri/r300/compiler/r300_fragprog_emit.c | 10 +++++----- .../drivers/dri/r300/compiler/r300_fragprog_swizzle.c | 2 +- src/mesa/drivers/dri/r300/compiler/r500_fragprog.c | 4 ++-- src/mesa/drivers/dri/r300/compiler/r500_fragprog.h | 4 ++-- .../drivers/dri/r300/compiler/r500_fragprog_emit.c | 8 ++++---- .../drivers/dri/r300/compiler/radeon_program_pair.c | 7 +++---- .../drivers/dri/r300/compiler/radeon_program_pair.h | 3 ++- 9 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/mesa/drivers/dri/r300/compiler/r300_fragprog.c b/src/mesa/drivers/dri/r300/compiler/r300_fragprog.c index 00ef9645711..932f9d97716 100644 --- a/src/mesa/drivers/dri/r300/compiler/r300_fragprog.c +++ b/src/mesa/drivers/dri/r300/compiler/r300_fragprog.c @@ -25,11 +25,11 @@ * */ -#include "compiler/r300_fragprog.h" +#include "r300_fragprog.h" #include "shader/prog_parameter.h" -#include "r300_reg.h" +#include "../r300_reg.h" static void reset_srcreg(struct prog_src_register* reg) { diff --git a/src/mesa/drivers/dri/r300/compiler/r300_fragprog.h b/src/mesa/drivers/dri/r300/compiler/r300_fragprog.h index 186fad6490f..21507bd8e06 100644 --- a/src/mesa/drivers/dri/r300/compiler/r300_fragprog.h +++ b/src/mesa/drivers/dri/r300/compiler/r300_fragprog.h @@ -36,8 +36,8 @@ #include "shader/program.h" #include "shader/prog_instruction.h" -#include "compiler/radeon_compiler.h" -#include "compiler/radeon_program.h" +#include "radeon_compiler.h" +#include "radeon_program.h" extern GLboolean r300BuildFragmentProgramHwCode(struct r300_fragment_program_compiler *compiler); diff --git a/src/mesa/drivers/dri/r300/compiler/r300_fragprog_emit.c b/src/mesa/drivers/dri/r300/compiler/r300_fragprog_emit.c index d6784d1c22a..520d81d3b4f 100644 --- a/src/mesa/drivers/dri/r300/compiler/r300_fragprog_emit.c +++ b/src/mesa/drivers/dri/r300/compiler/r300_fragprog_emit.c @@ -38,12 +38,12 @@ * \todo FogOption */ -#include "compiler/r300_fragprog.h" +#include "r300_fragprog.h" -#include "r300_reg.h" +#include "../r300_reg.h" -#include "compiler/radeon_program_pair.h" -#include "compiler/r300_fragprog_swizzle.h" +#include "radeon_program_pair.h" +#include "r300_fragprog_swizzle.h" #define PROG_CODE \ @@ -334,7 +334,7 @@ GLboolean r300BuildFragmentProgramHwCode(struct r300_fragment_program_compiler * code->node[0].alu_end = -1; code->node[0].tex_end = -1; - if (!radeonPairProgram(compiler->program, &pair_handler, compiler)) + if (!radeonPairProgram(compiler->program, &pair_handler, compiler, compiler->debug)) return GL_FALSE; if (!finish_node(compiler)) diff --git a/src/mesa/drivers/dri/r300/compiler/r300_fragprog_swizzle.c b/src/mesa/drivers/dri/r300/compiler/r300_fragprog_swizzle.c index fc9d855bce6..9e88d14ad54 100644 --- a/src/mesa/drivers/dri/r300/compiler/r300_fragprog_swizzle.c +++ b/src/mesa/drivers/dri/r300/compiler/r300_fragprog_swizzle.c @@ -33,7 +33,7 @@ #include "r300_fragprog_swizzle.h" -#include "r300_reg.h" +#include "../r300_reg.h" #include "radeon_nqssadce.h" #define MAKE_SWZ3(x, y, z) (MAKE_SWIZZLE4(SWIZZLE_##x, SWIZZLE_##y, SWIZZLE_##z, SWIZZLE_ZERO)) diff --git a/src/mesa/drivers/dri/r300/compiler/r500_fragprog.c b/src/mesa/drivers/dri/r300/compiler/r500_fragprog.c index fdc18caacb7..4545982bf16 100644 --- a/src/mesa/drivers/dri/r300/compiler/r500_fragprog.c +++ b/src/mesa/drivers/dri/r300/compiler/r500_fragprog.c @@ -25,9 +25,9 @@ * */ -#include "compiler/r500_fragprog.h" +#include "r500_fragprog.h" -#include "r300_reg.h" +#include "../r300_reg.h" static void reset_srcreg(struct prog_src_register* reg) { diff --git a/src/mesa/drivers/dri/r300/compiler/r500_fragprog.h b/src/mesa/drivers/dri/r300/compiler/r500_fragprog.h index 232993f5816..a1ffde1e838 100644 --- a/src/mesa/drivers/dri/r300/compiler/r500_fragprog.h +++ b/src/mesa/drivers/dri/r300/compiler/r500_fragprog.h @@ -36,8 +36,8 @@ #include "shader/prog_parameter.h" #include "shader/prog_instruction.h" -#include "compiler/radeon_compiler.h" -#include "compiler/radeon_nqssadce.h" +#include "radeon_compiler.h" +#include "radeon_nqssadce.h" extern GLboolean r500BuildFragmentProgramHwCode(struct r300_fragment_program_compiler *compiler); diff --git a/src/mesa/drivers/dri/r300/compiler/r500_fragprog_emit.c b/src/mesa/drivers/dri/r300/compiler/r500_fragprog_emit.c index 3d5ddbb981b..5640ed0bcaa 100644 --- a/src/mesa/drivers/dri/r300/compiler/r500_fragprog_emit.c +++ b/src/mesa/drivers/dri/r300/compiler/r500_fragprog_emit.c @@ -43,11 +43,11 @@ * */ -#include "compiler/r500_fragprog.h" +#include "r500_fragprog.h" -#include "r300_reg.h" +#include "../r300_reg.h" -#include "compiler/radeon_program_pair.h" +#include "radeon_program_pair.h" #define PROG_CODE \ @@ -310,7 +310,7 @@ GLboolean r500BuildFragmentProgramHwCode(struct r300_fragment_program_compiler * code->inst_offset = 0; code->inst_end = -1; - if (!radeonPairProgram(compiler->program, &pair_handler, compiler)) + if (!radeonPairProgram(compiler->program, &pair_handler, compiler, compiler->debug)) return GL_FALSE; if ((code->inst[code->inst_end].inst0 & R500_INST_TYPE_MASK) != R500_INST_TYPE_OUT) { diff --git a/src/mesa/drivers/dri/r300/compiler/radeon_program_pair.c b/src/mesa/drivers/dri/r300/compiler/radeon_program_pair.c index 4be948b0c11..254431731b3 100644 --- a/src/mesa/drivers/dri/r300/compiler/radeon_program_pair.c +++ b/src/mesa/drivers/dri/r300/compiler/radeon_program_pair.c @@ -35,8 +35,6 @@ #include "radeon_program_pair.h" -#include "radeon_common.h" - #include "memory_pool.h" #include "shader/prog_print.h" @@ -877,7 +875,8 @@ static void emit_alu(struct pair_state *s) GLboolean radeonPairProgram(struct gl_program *program, - const struct radeon_pair_handler* handler, void *userdata) + const struct radeon_pair_handler* handler, void *userdata, + GLboolean debug) { struct pair_state s; @@ -886,7 +885,7 @@ GLboolean radeonPairProgram(struct gl_program *program, s.Program = program; s.Handler = handler; s.UserData = userdata; - s.Debug = (RADEON_DEBUG & DEBUG_PIXEL) ? GL_TRUE : GL_FALSE; + s.Debug = debug; s.Verbose = GL_FALSE && s.Debug; if (s.Debug) diff --git a/src/mesa/drivers/dri/r300/compiler/radeon_program_pair.h b/src/mesa/drivers/dri/r300/compiler/radeon_program_pair.h index 9f479766332..86e3ec4537d 100644 --- a/src/mesa/drivers/dri/r300/compiler/radeon_program_pair.h +++ b/src/mesa/drivers/dri/r300/compiler/radeon_program_pair.h @@ -140,7 +140,8 @@ struct radeon_pair_handler { }; GLboolean radeonPairProgram(struct gl_program *program, - const struct radeon_pair_handler*, void *userdata); + const struct radeon_pair_handler*, void *userdata, + GLboolean debug); void radeonPrintPairInstruction(struct radeon_pair_instruction *inst); -- 2.30.2