diff options
| author | Emil Velikov <emil.l.velikov@gmail.com> | 2015-08-15 15:42:34 +0100 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2015-09-04 21:38:51 +0100 |
| commit | cf7e32bdf99740ae3249f100b5cb2f0de54a20ef (patch) | |
| tree | de711f677c79c9c73780c7508ec4b8b89907db88 /intel/intel_decode.c | |
| parent | 99722bfec6f1bbfc5148701f85ac145140d46afb (diff) | |
| download | external_libdrm-cf7e32bdf99740ae3249f100b5cb2f0de54a20ef.tar.gz external_libdrm-cf7e32bdf99740ae3249f100b5cb2f0de54a20ef.tar.bz2 external_libdrm-cf7e32bdf99740ae3249f100b5cb2f0de54a20ef.zip | |
intel: resolve shadowing warnings
v2: keep the bo_gem declaration in exec2() within the loop (Chris)
Cc: intel-gfx@lists.freedesktop.org
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'intel/intel_decode.c')
| -rw-r--r-- | intel/intel_decode.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/intel/intel_decode.c b/intel/intel_decode.c index 2b902a39..345d4576 100644 --- a/intel/intel_decode.c +++ b/intel/intel_decode.c @@ -3630,7 +3630,6 @@ decode_3d_965(struct drm_intel_decode *ctx) case 0x7a00: if (IS_GEN6(devid) || IS_GEN7(devid)) { - unsigned int i; if (len != 4 && len != 5) fprintf(out, "Bad count in PIPE_CONTROL\n"); @@ -3732,8 +3731,6 @@ decode_3d_965(struct drm_intel_decode *ctx) if (opcode_3d->func) { return opcode_3d->func(ctx); } else { - unsigned int i; - instr_out(ctx, 0, "%s\n", opcode_3d->name); for (i = 1; i < len; i++) { @@ -3883,9 +3880,9 @@ drm_intel_decode_set_head_tail(struct drm_intel_decode *ctx, void drm_intel_decode_set_output_file(struct drm_intel_decode *ctx, - FILE *out) + FILE *output) { - ctx->out = out; + ctx->out = output; } /** |