intel: Add per-dword decode of gen7 3DPRIMITIVE.

[glsdk/libdrm.git] / intel / intel_decode.c

diff --git a/intel/intel_decode.c b/intel/intel_decode.c
index 064c12a6a242983df48c857616873f0730aca4ea..df9b704c8ee6b15dec88eefae852d9c8ce510237 100644 (file)
--- a/intel/intel_decode.c
+++ b/intel/intel_decode.c
@@ -2577,10 +2577,8 @@ static const char *get_965_element_component(uint32_t data, int component)
        }
 }
 
-static const char *get_965_prim_type(uint32_t data)
+static const char *get_965_prim_type(uint32_t primtype)
 {
-       uint32_t primtype = (data >> 10) & 0x1f;
-
        switch (primtype) {
        case 0x01:
                return "point list";
@@ -2744,6 +2742,17 @@ gen7_3DSTATE_DEPTH_STENCIL_STATE_POINTERS(struct drm_intel_decode *ctx)
        return 2;
 }
 
+static int
+gen7_3DSTATE_HIER_DEPTH_BUFFER(struct drm_intel_decode *ctx)
+{
+       instr_out(ctx, 0, "3DSTATE_HIER_DEPTH_BUFFER\n");
+       instr_out(ctx, 1, "pitch %db\n",
+                 (ctx->data[1] & 0x1ffff) + 1);
+       instr_out(ctx, 2, "pointer to HiZ buffer\n");
+
+       return 3;
+}
+
 static int
 gen6_3DSTATE_CC_STATE_POINTERS(struct drm_intel_decode *ctx)
 {
@@ -2993,6 +3002,43 @@ gen7_3DSTATE_WM(struct drm_intel_decode *ctx)
        return 3;
 }
 
+static int
+gen4_3DPRIMITIVE(struct drm_intel_decode *ctx)
+{
+       instr_out(ctx, 0,
+                 "3DPRIMITIVE: %s %s\n",
+                 get_965_prim_type((ctx->data[0] >> 10) & 0x1f),
+                 (ctx->data[0] & (1 << 15)) ? "random" : "sequential");
+       instr_out(ctx, 1, "vertex count\n");
+       instr_out(ctx, 2, "start vertex\n");
+       instr_out(ctx, 3, "instance count\n");
+       instr_out(ctx, 4, "start instance\n");
+       instr_out(ctx, 5, "index bias\n");
+
+       return 6;
+}
+
+static int
+gen7_3DPRIMITIVE(struct drm_intel_decode *ctx)
+{
+       bool indirect = !!(ctx->data[0] & (1 << 10));
+
+       instr_out(ctx, 0,
+                 "3DPRIMITIVE: %s%s\n",
+                 indirect ? " indirect" : "",
+                 (ctx->data[0] & (1 << 8)) ? " predicated" : "");
+       instr_out(ctx, 1, "%s %s\n",
+                 get_965_prim_type(ctx->data[1] & 0x3f),
+                 (ctx->data[1] & (1 << 8)) ? "random" : "sequential");
+       instr_out(ctx, 2, indirect ? "ignored" : "vertex count\n");
+       instr_out(ctx, 3, indirect ? "ignored" : "start vertex\n");
+       instr_out(ctx, 4, indirect ? "ignored" : "instance count\n");
+       instr_out(ctx, 5, indirect ? "ignored" : "start instance\n");
+       instr_out(ctx, 6, indirect ? "ignored" : "index bias\n");
+
+       return 7;
+}
+
 static int
 decode_3d_965(struct drm_intel_decode *ctx)
 {
@@ -3027,7 +3073,8 @@ decode_3d_965(struct drm_intel_decode *ctx)
                { 0x7805, 0x00ff, 3, 3, "3DSTATE_URB" },
                { 0x7804, 0x00ff, 3, 3, "3DSTATE_CLEAR_PARAMS" },
                { 0x7806, 0x00ff, 3, 3, "3DSTATE_STENCIL_BUFFER" },
-               { 0x7807, 0x00ff, 4, 4, "3DSTATE_HIER_DEPTH_BUFFER" },
+               { 0x7807, 0x00ff, 4, 4, "3DSTATE_HIER_DEPTH_BUFFER", 6 },
+               { 0x7807, 0x00ff, 3, 3, "3DSTATE_HIER_DEPTH_BUFFER", 7, gen7_3DSTATE_HIER_DEPTH_BUFFER },
                { 0x7808, 0x00ff, 5, 257, "3DSTATE_VERTEX_BUFFERS" },
                { 0x7809, 0x00ff, 3, 256, "3DSTATE_VERTEX_ELEMENTS" },
                { 0x780a, 0x00ff, 3, 3, "3DSTATE_INDEX_BUFFER" },
@@ -3092,8 +3139,8 @@ decode_3d_965(struct drm_intel_decode *ctx)
                { 0x7917, 0x00ff, 2, 2+128*2, "3DSTATE_SO_DECL_LIST" },
                { 0x7918, 0x00ff, 4, 4, "3DSTATE_SO_BUFFER" },
                { 0x7a00, 0x00ff, 4, 6, "PIPE_CONTROL" },
-               { 0x7b00, 0x00ff, 7, 7, "3DPRIMITIVE", 7 },
-               { 0x7b00, 0x00ff, 6, 6, "3DPRIMITIVE" },
+               { 0x7b00, 0x00ff, 7, 7, NULL, 7, gen7_3DPRIMITIVE },
+               { 0x7b00, 0x00ff, 6, 6, NULL, 0, gen4_3DPRIMITIVE },
        }, *opcode_3d = NULL;
 
        opcode = (data[0] & 0xffff0000) >> 16;
@@ -3581,20 +3628,6 @@ decode_3d_965(struct drm_intel_decode *ctx)
                        instr_out(ctx, 3, "immediate dword high\n");
                        return len;
                }
-       case 0x7b00:
-               if (ctx->gen == 7)
-                       break;
-
-               instr_out(ctx, 0,
-                         "3DPRIMITIVE: %s %s\n",
-                         get_965_prim_type(data[0]),
-                         (data[0] & (1 << 15)) ? "random" : "sequential");
-               instr_out(ctx, 1, "vertex count\n");
-               instr_out(ctx, 2, "start vertex\n");
-               instr_out(ctx, 3, "instance count\n");
-               instr_out(ctx, 4, "start instance\n");
-               instr_out(ctx, 5, "index bias\n");
-               return len;
        }
 
        if (opcode_3d) {