Iago Toral Quiroga <ito...@igalia.com> writes:
> ---
> src/mesa/drivers/dri/i965/brw_fs_reg_allocate.cpp | 2 +-
> src/mesa/drivers/dri/i965/brw_vec4.cpp | 2 +-
> src/mesa/drivers/dri/i965/intel_debug.c | 3 ++-
> src/mesa/drivers/dri/i965/intel_debug.h | 5 +++--
> 4 files changed, 7 insertions(+), 5 deletions(-)
>
> diff --git a/src/mesa/drivers/dri/i965/brw_fs_reg_allocate.cpp
> b/src/mesa/drivers/dri/i965/brw_fs_reg_allocate.cpp
> index f25f2ec..714248a 100644
> --- a/src/mesa/drivers/dri/i965/brw_fs_reg_allocate.cpp
> +++ b/src/mesa/drivers/dri/i965/brw_fs_reg_allocate.cpp
> @@ -634,7 +634,7 @@ fs_visitor::assign_regs(bool allow_spilling)
> }
>
> /* Debug of register spilling: Go spill everything. */
> - if (unlikely(INTEL_DEBUG & DEBUG_SPILL)) {
> + if (unlikely(INTEL_DEBUG & DEBUG_SPILL_FS)) {
> int reg = choose_spill_reg(g);
>
> if (reg != -1) {
> diff --git a/src/mesa/drivers/dri/i965/brw_vec4.cpp
> b/src/mesa/drivers/dri/i965/brw_vec4.cpp
> index 53270fb..6cf5ede 100644
> --- a/src/mesa/drivers/dri/i965/brw_vec4.cpp
> +++ b/src/mesa/drivers/dri/i965/brw_vec4.cpp
> @@ -1814,7 +1814,7 @@ vec4_visitor::run(gl_clip_plane *clip_planes)
>
> setup_payload();
>
> - if (false) {
> + if (unlikely(INTEL_DEBUG & DEBUG_SPILL_VEC4)) {
> /* Debug of register spilling: Go spill everything. */
> const int grf_count = alloc.count;
> float spill_costs[alloc.count];
> diff --git a/src/mesa/drivers/dri/i965/intel_debug.c
> b/src/mesa/drivers/dri/i965/intel_debug.c
> index a077731..8d34349 100644
> --- a/src/mesa/drivers/dri/i965/intel_debug.c
> +++ b/src/mesa/drivers/dri/i965/intel_debug.c
> @@ -69,7 +69,8 @@ static const struct dri_debug_control debug_control[] = {
> { "ann", DEBUG_ANNOTATION },
> { "no8", DEBUG_NO8 },
> { "vec4vs", DEBUG_VEC4VS },
> - { "spill", DEBUG_SPILL },
> + { "spill_frag", DEBUG_SPILL_FS },
How about we call this "spill_fs" instead? The flag doesn't only affect
fragment shaders, AFAICT it will cause all programs compiled with the FS
back-end [F for fast ;)] to spill everything. With that fixed:
Reviewed-by: Francisco Jerez <curroje...@riseup.net>
> + { "spill_vec4", DEBUG_SPILL_VEC4 },
> { "cs", DEBUG_CS },
> { NULL, 0 }
> };
> diff --git a/src/mesa/drivers/dri/i965/intel_debug.h
> b/src/mesa/drivers/dri/i965/intel_debug.h
> index 4689492..b7d0c82 100644
> --- a/src/mesa/drivers/dri/i965/intel_debug.h
> +++ b/src/mesa/drivers/dri/i965/intel_debug.h
> @@ -64,8 +64,9 @@ extern uint64_t INTEL_DEBUG;
> #define DEBUG_ANNOTATION (1ull << 28)
> #define DEBUG_NO8 (1ull << 29)
> #define DEBUG_VEC4VS (1ull << 30)
> -#define DEBUG_SPILL (1ull << 31)
> -#define DEBUG_CS (1ull << 32)
> +#define DEBUG_SPILL_FS (1ull << 31)
> +#define DEBUG_SPILL_VEC4 (1ull << 32)
> +#define DEBUG_CS (1ull << 33)
>
> #ifdef HAVE_ANDROID_PLATFORM
> #define LOG_TAG "INTEL-MESA"
> --
> 1.9.1
signature.asc
Description: PGP signature
_______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
