summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers
diff options
context:
space:
mode:
authorChia-I Wu <[email protected]>2014-09-19 15:40:31 +0800
committerChia-I Wu <[email protected]>2014-09-19 16:02:11 +0800
commit45cbc9267eec3ac5b426aab562e4856e3d3c50c1 (patch)
treec8860a55db60abc75b1eb83b130869b47cc05e88 /src/gallium/drivers
parent8a2352262e27bf7d3c31a20b72eb04772d56ff42 (diff)
ilo: rename ILO_DEBUG=3d
It has been a bad name since we added the builder. Rename it to ILO_DEBUG=batch to match i965, and call ilo_builder_decode() from ilo_cp_submit_internal().
Diffstat (limited to 'src/gallium/drivers')
-rw-r--r--src/gallium/drivers/ilo/ilo_3d.c3
-rw-r--r--src/gallium/drivers/ilo/ilo_builder.h2
-rw-r--r--src/gallium/drivers/ilo/ilo_common.h2
-rw-r--r--src/gallium/drivers/ilo/ilo_cp.c3
-rw-r--r--src/gallium/drivers/ilo/ilo_screen.c2
5 files changed, 6 insertions, 6 deletions
diff --git a/src/gallium/drivers/ilo/ilo_3d.c b/src/gallium/drivers/ilo/ilo_3d.c
index 2fe98a5b8e9..9839358ca82 100644
--- a/src/gallium/drivers/ilo/ilo_3d.c
+++ b/src/gallium/drivers/ilo/ilo_3d.c
@@ -385,9 +385,6 @@ ilo_3d_process_query(struct ilo_context *ilo, struct ilo_query *q)
void
ilo_3d_cp_submitted(struct ilo_3d *hw3d)
{
- if (ilo_debug & ILO_DEBUG_3D)
- ilo_builder_decode(&hw3d->cp->builder);
-
/* invalidate the pipeline */
ilo_3d_pipeline_invalidate(hw3d->pipeline,
ILO_3D_PIPELINE_INVALIDATE_BATCH_BO |
diff --git a/src/gallium/drivers/ilo/ilo_builder.h b/src/gallium/drivers/ilo/ilo_builder.h
index 2dab97fa306..ab1ee11dce6 100644
--- a/src/gallium/drivers/ilo/ilo_builder.h
+++ b/src/gallium/drivers/ilo/ilo_builder.h
@@ -170,7 +170,7 @@ ilo_builder_writer_checked_record(struct ilo_builder *builder,
enum ilo_builder_item_type item,
unsigned offset, unsigned size)
{
- if (unlikely(ilo_debug & ILO_DEBUG_3D)) {
+ if (unlikely(ilo_debug & ILO_DEBUG_BATCH)) {
if (!ilo_builder_writer_record(builder, which, item, offset, size)) {
builder->unrecoverable_error = true;
builder->writers[which].item_used = 0;
diff --git a/src/gallium/drivers/ilo/ilo_common.h b/src/gallium/drivers/ilo/ilo_common.h
index 03f42248a97..f83aa91657f 100644
--- a/src/gallium/drivers/ilo/ilo_common.h
+++ b/src/gallium/drivers/ilo/ilo_common.h
@@ -56,7 +56,7 @@
#define ILO_PRIM_MAX (PIPE_PRIM_MAX + 1)
enum ilo_debug {
- ILO_DEBUG_3D = 1 << 0,
+ ILO_DEBUG_BATCH = 1 << 0,
ILO_DEBUG_VS = 1 << 1,
ILO_DEBUG_GS = 1 << 2,
ILO_DEBUG_FS = 1 << 3,
diff --git a/src/gallium/drivers/ilo/ilo_cp.c b/src/gallium/drivers/ilo/ilo_cp.c
index f7411a92465..37e9b2ae2bf 100644
--- a/src/gallium/drivers/ilo/ilo_cp.c
+++ b/src/gallium/drivers/ilo/ilo_cp.c
@@ -138,6 +138,9 @@ ilo_cp_submit_internal(struct ilo_cp *cp)
cp->last_submitted_bo = bo;
intel_bo_reference(cp->last_submitted_bo);
+ if (ilo_debug & ILO_DEBUG_BATCH)
+ ilo_builder_decode(&cp->builder);
+
if (cp->submit_callback)
cp->submit_callback(cp, cp->submit_callback_data);
}
diff --git a/src/gallium/drivers/ilo/ilo_screen.c b/src/gallium/drivers/ilo/ilo_screen.c
index 8d170893006..4988d6be97b 100644
--- a/src/gallium/drivers/ilo/ilo_screen.c
+++ b/src/gallium/drivers/ilo/ilo_screen.c
@@ -42,7 +42,7 @@
int ilo_debug;
static const struct debug_named_value ilo_debug_flags[] = {
- { "3d", ILO_DEBUG_3D, "Dump 3D commands and states" },
+ { "batch", ILO_DEBUG_BATCH, "Dump batch/state/surface/instruction buffers" },
{ "vs", ILO_DEBUG_VS, "Dump vertex shaders" },
{ "gs", ILO_DEBUG_GS, "Dump geometry shaders" },
{ "fs", ILO_DEBUG_FS, "Dump fragment shaders" },