diff options
| author | Eric Anholt <[email protected]> | 2014-02-20 13:31:40 -0800 |
|---|---|---|
| committer | Eric Anholt <[email protected]> | 2014-02-22 19:23:20 -0800 |
| commit | fdcf6c8fad9edfc87eb5f647af254a6fd6b3b71c (patch) | |
| tree | c8b695d13504251c16893c2390dec3999cc3565f /src/mesa | |
| parent | f474ced0d13e288e24e694e583f041562c7ee2c8 (diff) | |
i965: Use the object label when available for INTEL_DEBUG=vs,gs,fs output.
Note that this requires updated run.py in shader_db.
Reviewed-by: Ian Romanick <[email protected]>
Reviewed-by: Kenneth Graunke <[email protected]>
Reviewed-by: Matt Turner <[email protected]>
Diffstat (limited to 'src/mesa')
4 files changed, 10 insertions, 4 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_fs_generator.cpp b/src/mesa/drivers/dri/i965/brw_fs_generator.cpp index 3f2060d86bb..104c0693b81 100644 --- a/src/mesa/drivers/dri/i965/brw_fs_generator.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs_generator.cpp @@ -1326,7 +1326,8 @@ fs_generator::generate_code(exec_list *instructions, FILE *dump_file) if (unlikely(INTEL_DEBUG & DEBUG_WM)) { if (prog) { - printf("Native code for fragment shader %d (SIMD%d dispatch):\n", + printf("Native code for %s fragment shader %d (SIMD%d dispatch):\n", + prog->Label ? prog->Label : "unnamed", prog->Name, dispatch_width); } else if (fp) { printf("Native code for fragment program %d (SIMD%d dispatch):\n", diff --git a/src/mesa/drivers/dri/i965/brw_vec4_generator.cpp b/src/mesa/drivers/dri/i965/brw_vec4_generator.cpp index d3d593941b2..23c0542045b 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4_generator.cpp +++ b/src/mesa/drivers/dri/i965/brw_vec4_generator.cpp @@ -1271,7 +1271,9 @@ vec4_generator::generate_code(exec_list *instructions) if (unlikely(debug_flag)) { if (shader_prog) { - printf("Native code for vertex shader %d:\n", shader_prog->Name); + printf("Native code for %s vertex shader %d:\n", + shader_prog->Label ? shader_prog->Label : "unnamed", + shader_prog->Name); } else { printf("Native code for vertex program %d:\n", prog->Id); } diff --git a/src/mesa/drivers/dri/i965/gen8_fs_generator.cpp b/src/mesa/drivers/dri/i965/gen8_fs_generator.cpp index 86e772c29e2..96e532edf42 100644 --- a/src/mesa/drivers/dri/i965/gen8_fs_generator.cpp +++ b/src/mesa/drivers/dri/i965/gen8_fs_generator.cpp @@ -838,7 +838,8 @@ gen8_fs_generator::generate_code(exec_list *instructions) if (unlikely(INTEL_DEBUG & DEBUG_WM)) { if (prog) { - printf("Native code for fragment shader %d (SIMD%d dispatch):\n", + printf("Native code for %s fragment shader %d (SIMD%d dispatch):\n", + shader_prog->Label ? shader_prog->Label : "unnamed", shader_prog->Name, dispatch_width); } else if (fp) { printf("Native code for fragment program %d (SIMD%d dispatch):\n", diff --git a/src/mesa/drivers/dri/i965/gen8_vec4_generator.cpp b/src/mesa/drivers/dri/i965/gen8_vec4_generator.cpp index 7f6b2094e79..45393b536d7 100644 --- a/src/mesa/drivers/dri/i965/gen8_vec4_generator.cpp +++ b/src/mesa/drivers/dri/i965/gen8_vec4_generator.cpp @@ -801,7 +801,9 @@ gen8_vec4_generator::generate_code(exec_list *instructions) if (unlikely(debug_flag)) { if (shader_prog) { - printf("Native code for vertex shader %d:\n", shader_prog->Name); + printf("Native code for %s vertex shader %d:\n", + shader_prog->Label ? shader_prog->Label : "unnamed", + shader_prog->Name); } else { printf("Native code for vertex program %d:\n", prog->Id); } |