[Mesa-dev] [PATCH 1/3] intel: remove blorp_alloc_dynamic_state unused argument

[Emil Velikov]

From: Emil Velikov <emil.velikov at collabora.com>

The enum aub_state_struct_type type is a seeming left over from the
i965 days. Since we don't use we can safely drop it.

As a nice side-effect the only libdrm_intel requirement in src/intel
[outside of tools/aubinator] - include intel_aub.h can now be removed.
And with next commit we'll remove the dependency in the build system(s).

Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
---
 src/intel/blorp/blorp_genX_exec.h  | 12 +++++-------
 src/intel/vulkan/genX_blorp_exec.c |  1 -
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/intel/blorp/blorp_genX_exec.h b/src/intel/blorp/blorp_genX_exec.h
index dc1b7735ab3..379146245d9 100644
--- a/src/intel/blorp/blorp_genX_exec.h
+++ b/src/intel/blorp/blorp_genX_exec.h
@@ -27,7 +27,6 @@
 #include "blorp_priv.h"
 #include "common/gen_device_info.h"
 #include "common/gen_sample_positions.h"
-#include "intel_aub.h"
 
 /**
  * This file provides the blorp pipeline setup and execution functionality.
@@ -53,7 +52,6 @@ blorp_emit_reloc(struct blorp_batch *batch,
 
 static void *
 blorp_alloc_dynamic_state(struct blorp_batch *batch,
-                          enum aub_state_struct_type type,
                           uint32_t size,
                           uint32_t alignment,
                           uint32_t *offset);
@@ -916,7 +914,7 @@ blorp_emit_blend_state(struct blorp_batch *batch,
    }
 
    uint32_t offset;
-   void *state = blorp_alloc_dynamic_state(batch, AUB_TRACE_BLEND_STATE,
+   void *state = blorp_alloc_dynamic_state(batch,
                                            GENX(BLEND_STATE_length) * 4,
                                            64, &offset);
    GENX(BLEND_STATE_pack)(NULL, state, &blend);
@@ -951,7 +949,7 @@ blorp_emit_color_calc_state(struct blorp_batch *batch,
 #endif
 
    uint32_t offset;
-   void *state = blorp_alloc_dynamic_state(batch, AUB_TRACE_CC_STATE,
+   void *state = blorp_alloc_dynamic_state(batch,
                                            GENX(COLOR_CALC_STATE_length) * 4,
                                            64, &offset);
    GENX(COLOR_CALC_STATE_pack)(NULL, state, &cc);
@@ -1031,7 +1029,7 @@ blorp_emit_depth_stencil_state(struct blorp_batch *batch,
    GENX(3DSTATE_WM_DEPTH_STENCIL_pack)(NULL, dw, &ds);
 #else
    uint32_t offset;
-   void *state = blorp_alloc_dynamic_state(batch, AUB_TRACE_DEPTH_STENCIL_STATE,
+   void *state = blorp_alloc_dynamic_state(batch,
                                            GENX(DEPTH_STENCIL_STATE_length) * 4,
                                            64, &offset);
    GENX(DEPTH_STENCIL_STATE_pack)(NULL, state, &ds);
@@ -1201,7 +1199,7 @@ blorp_emit_sampler_state(struct blorp_batch *batch,
    };
 
    uint32_t offset;
-   void *state = blorp_alloc_dynamic_state(batch, AUB_TRACE_SAMPLER_STATE,
+   void *state = blorp_alloc_dynamic_state(batch,
                                            GENX(SAMPLER_STATE_length) * 4,
                                            32, &offset);
    GENX(SAMPLER_STATE_pack)(NULL, state, &sampler);
@@ -1349,7 +1347,7 @@ blorp_emit_viewport_state(struct blorp_batch *batch,
 {
    uint32_t cc_vp_offset;
 
-   void *state = blorp_alloc_dynamic_state(batch, AUB_TRACE_CC_VP_STATE,
+   void *state = blorp_alloc_dynamic_state(batch,
                                            GENX(CC_VIEWPORT_length) * 4, 32,
                                            &cc_vp_offset);
 
diff --git a/src/intel/vulkan/genX_blorp_exec.c b/src/intel/vulkan/genX_blorp_exec.c
index 86730e07def..fc6d1324ea9 100644
--- a/src/intel/vulkan/genX_blorp_exec.c
+++ b/src/intel/vulkan/genX_blorp_exec.c
@@ -66,7 +66,6 @@ blorp_surface_reloc(struct blorp_batch *batch, uint32_t ss_offset,
 
 static void *
 blorp_alloc_dynamic_state(struct blorp_batch *batch,
-                          enum aub_state_struct_type type,
                           uint32_t size,
                           uint32_t alignment,
                           uint32_t *offset)
-- 
2.11.1