KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

intel/compiler: Use INTEL_DEBUG=blorp to dump blorp shaders 

Make INTEL_DEBUG=blorp dump the blorp shaders instead using the
general INTEL_DEBUG=fs,vs, which is now reserved to the actual FS and
VS shaders used by the pipeline.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9779>
This commit is contained in:
Caio Marcelo de Oliveira Filho 2021-03-23 11:38:28 -07:00 committed by Marge Bot
parent 7fb1e58651
commit 05933fb0f7
4 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/intel/blorp/blorp.c
View File

@ -28,6 +28,7 @@
#include "blorp_priv.h"
#include "compiler/brw_compiler.h"
#include "compiler/brw_nir.h"
#include "dev/gen_debug.h"
const char *
blorp_shader_type_to_name(enum blorp_shader_type type)
@ -223,6 +224,8 @@ blorp_compile_fs(struct blorp_context *blorp, void *mem_ctx,
.use_rep_send = use_repclear,
.log_data = blorp->driver_ctx,
.debug_flag = DEBUG_BLORP,
};
return brw_compile_fs(compiler, mem_ctx, &params);
@ -256,6 +259,8 @@ blorp_compile_vs(struct blorp_context *blorp, void *mem_ctx,
.key = &vs_key,
.prog_data = vs_prog_data,
.log_data = blorp->driver_ctx,
.debug_flag = DEBUG_BLORP,
};
return brw_compile_vs(compiler, mem_ctx, &params);

6
src/intel/compiler/brw_compiler.h
View File

@ -1453,6 +1453,9 @@ struct brw_compile_vs_params {
void *log_data;
char *error_str;
/* If unset, DEBUG_VS is used. */
uint64_t debug_flag;
};
/**
@ -1570,6 +1573,9 @@ struct brw_compile_fs_params {
void *log_data;
char *error_str;
/* If unset, DEBUG_WM is used. */
uint64_t debug_flag;
};
/**

3
src/intel/compiler/brw_fs.cpp
View File

@ -9063,7 +9063,8 @@ brw_compile_fs(const struct brw_compiler *compiler,
const struct brw_wm_prog_key *key = params->key;
struct brw_wm_prog_data *prog_data = params->prog_data;
bool allow_spilling = params->allow_spilling;
const bool debug_enabled = INTEL_DEBUG & DEBUG_WM;
const bool debug_enabled =
INTEL_DEBUG & (params->debug_flag ? params->debug_flag : DEBUG_WM);
prog_data->base.stage = MESA_SHADER_FRAGMENT;

3
src/intel/compiler/brw_vec4.cpp
View File

@ -2837,7 +2837,8 @@ brw_compile_vs(const struct brw_compiler *compiler,
struct nir_shader *nir = params->nir;
const struct brw_vs_prog_key *key = params->key;
struct brw_vs_prog_data *prog_data = params->prog_data;
const bool debug_enabled = INTEL_DEBUG & DEBUG_VS;
const bool debug_enabled =
INTEL_DEBUG & (params->debug_flag ? params->debug_flag : DEBUG_VS);
prog_data->base.base.stage = MESA_SHADER_VERTEX;