diff options
| author | Eric Anholt <eric@anholt.net> | 2012-03-02 10:18:51 -0800 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2012-03-10 09:23:07 -0800 |
| commit | 9b87fd9a3df8c59461bc90b4620526d10f9b5771 (patch) | |
| tree | f598d6849a623ee84e46f7aa961e02c839723ae1 | |
| parent | 99c73378a1b440bcf594742445dfe14ab1e89128 (diff) | |
intel: Move the gen4-6 3DPRIMITIVE handling out of the switch statement.
| -rw-r--r-- | intel/intel_decode.c | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/intel/intel_decode.c b/intel/intel_decode.c index 2ea8f67e..af621d4f 100644 --- a/intel/intel_decode.c +++ b/intel/intel_decode.c @@ -3005,6 +3005,22 @@ gen7_3DSTATE_WM(struct drm_intel_decode *ctx) } static int +gen4_3DPRIMITIVE(struct drm_intel_decode *ctx) +{ + instr_out(ctx, 0, + "3DPRIMITIVE: %s %s\n", + get_965_prim_type(ctx->data[0]), + (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 decode_3d_965(struct drm_intel_decode *ctx) { uint32_t opcode; @@ -3105,7 +3121,7 @@ decode_3d_965(struct drm_intel_decode *ctx) { 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, 6, 6, NULL, 0, gen4_3DPRIMITIVE }, }, *opcode_3d = NULL; opcode = (data[0] & 0xffff0000) >> 16; @@ -3593,20 +3609,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) { |