summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKenneth Graunke <kenneth@whitecape.org>2015-11-04 22:29:05 -0800
committerKenneth Graunke <kenneth@whitecape.org>2015-11-08 18:09:54 -0800
commitf4b9cd6da5c8d9899c34a3764b3fdf945a01ee0a (patch)
treebe4268509886445f939929497b638300a71fc69b
parenta6b8e0a9ee77d84c76e8fafbb3928ebc668490e6 (diff)
shader time fixes
-rw-r--r--src/mesa/drivers/dri/i965/brw_program.c12
-rw-r--r--src/mesa/drivers/dri/i965/brw_vec4_hs_visitor.cpp3
2 files changed, 15 insertions, 0 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_program.c b/src/mesa/drivers/dri/i965/brw_program.c
index f016987498..c458269207 100644
--- a/src/mesa/drivers/dri/i965/brw_program.c
+++ b/src/mesa/drivers/dri/i965/brw_program.c
@@ -365,6 +365,8 @@ brw_report_shader_time(struct brw_context *brw)
switch (type) {
case ST_VS:
+ case ST_HS:
+ case ST_DS:
case ST_GS:
case ST_FS8:
case ST_FS16:
@@ -391,6 +393,8 @@ brw_report_shader_time(struct brw_context *brw)
switch (type) {
case ST_VS:
+ case ST_HS:
+ case ST_DS:
case ST_GS:
case ST_FS8:
case ST_FS16:
@@ -428,6 +432,12 @@ brw_report_shader_time(struct brw_context *brw)
case ST_VS:
stage = "vs";
break;
+ case ST_HS:
+ stage = "tcs";
+ break;
+ case ST_DS:
+ stage = "tes";
+ break;
case ST_GS:
stage = "gs";
break;
@@ -451,6 +461,8 @@ brw_report_shader_time(struct brw_context *brw)
fprintf(stderr, "\n");
print_shader_time_line("total", "vs", 0, total_by_type[ST_VS], total);
+ print_shader_time_line("total", "tcs", 0, total_by_type[ST_HS], total);
+ print_shader_time_line("total", "tes", 0, total_by_type[ST_DS], total);
print_shader_time_line("total", "gs", 0, total_by_type[ST_GS], total);
print_shader_time_line("total", "fs8", 0, total_by_type[ST_FS8], total);
print_shader_time_line("total", "fs16", 0, total_by_type[ST_FS16], total);
diff --git a/src/mesa/drivers/dri/i965/brw_vec4_hs_visitor.cpp b/src/mesa/drivers/dri/i965/brw_vec4_hs_visitor.cpp
index afb3c07e19..7a49d95439 100644
--- a/src/mesa/drivers/dri/i965/brw_vec4_hs_visitor.cpp
+++ b/src/mesa/drivers/dri/i965/brw_vec4_hs_visitor.cpp
@@ -134,6 +134,9 @@ vec4_hs_visitor::emit_thread_end()
emit(BRW_OPCODE_ENDIF);
+ if (unlikely(INTEL_DEBUG & DEBUG_SHADER_TIME))
+ emit_shader_time_end();
+
/* XXX: need 0xf channel enables... */
vec4_instruction *inst = emit(VS_OPCODE_URB_WRITE);