diff options
| author | Eric Anholt <eric@anholt.net> | 2011-12-20 14:27:17 -0800 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2011-12-29 16:43:50 -0800 |
| commit | 7b483188067c00014c5d263784d5140032a16cb6 (patch) | |
| tree | 23f683ce2e162b83a190ef4b2c3f7757b04c0d52 | |
| parent | 0c46f020c8a75a906f974dedb6628ed7eadb0b97 (diff) | |
intel: Remove c99ish variable declarations.
I'd rather be able to use c99 variable declarations (there's a lot of
awful code layout due to being c90ish), but I'll leave that for later.
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Acked-by: Eugeni Dodonov <eugeni@dodonov.net>
| -rw-r--r-- | intel/intel_decode.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/intel/intel_decode.c b/intel/intel_decode.c index 8d6ea553..e8410d0f 100644 --- a/intel/intel_decode.c +++ b/intel/intel_decode.c @@ -1269,6 +1269,8 @@ decode_3d_1d(uint32_t *data, uint32_t count, /* save vertex state for decode */ if (!IS_GEN2(devid)) { + int tex_num; + if (word == 2) { saved_s2_set = 1; saved_s2 = data[i]; @@ -1298,7 +1300,7 @@ decode_3d_1d(uint32_t *data, uint32_t count, case 2: instr_out(data, hw_offset, i, "S2: texcoord formats: "); - for (int tex_num = 0; + for (tex_num = 0; tex_num < 8; tex_num++) { switch ((data[i] >> tex_num * @@ -2768,7 +2770,7 @@ decode_3d_965(uint32_t *data, uint32_t count, uint32_t hw_offset, uint32_t devid { uint32_t opcode; unsigned int idx, len; - unsigned int i, sba_len; + unsigned int i, j, sba_len; const char *desc1 = NULL; struct { @@ -3186,7 +3188,7 @@ decode_3d_965(uint32_t *data, uint32_t count, uint32_t hw_offset, uint32_t devid *(float *)(&data[6])); instr_out(data, hw_offset, 7, "Global Depth Offset Clamp %f\n", *(float *)(&data[7])); - int i, j; + for (i = 0, j = 0; i < 8; i++, j += 2) instr_out(data, hw_offset, i + 8, "Attrib %d (Override %s%s%s%s, Const Source %d, Swizzle Select %d, " |