[Mesa-dev] [PATCH 1/5] nv30: remove unused nv40_fp_bra() and nvfx_fp_memcpy() functions

[Samuel Pitoiset]

On 05/12/2015 05:19 PM, Ilia Mirkin wrote:
> On Tue, May 12, 2015 at 11:13 AM, Samuel Pitoiset
> <samuel.pitoiset at gmail.com> wrote:
>> Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
>> ---
>>   src/gallium/drivers/nouveau/nv30/nvfx_fragprog.c | 40 ------------------------
>>   1 file changed, 40 deletions(-)
>>
>> diff --git a/src/gallium/drivers/nouveau/nv30/nvfx_fragprog.c b/src/gallium/drivers/nouveau/nv30/nvfx_fragprog.c
>> index bbdca81..29603fb 100644
>> --- a/src/gallium/drivers/nouveau/nv30/nvfx_fragprog.c
>> +++ b/src/gallium/drivers/nouveau/nv30/nvfx_fragprog.c
>> @@ -327,32 +327,6 @@ nv40_fp_rep(struct nvfx_fpc *fpc, unsigned count, unsigned target)
>>           //util_dynarray_append(&fpc->loop_stack, unsigned, target);
>>   }
>>
>> -/* warning: this only works forward, and probably only if not inside any IF */
>> -static void
>> -nv40_fp_bra(struct nvfx_fpc *fpc, unsigned target)
> Please keep. This is the only docs for this stuff.

I didn't know that an unused function could be useful for docs. :-)

>
>> -{
>> -        struct nvfx_relocation reloc;
>> -        uint32_t *hw;
>> -        fpc->inst_offset = fpc->fp->insn_len;
>> -        grow_insns(fpc, 4);
>> -        hw = &fpc->fp->insn[fpc->inst_offset];
>> -        /* I really wonder why fp16 precision is used. Presumably the hardware ignores it? */
>> -        hw[0] = (NV40_FP_OP_BRA_OPCODE_IF << NVFX_FP_OP_OPCODE_SHIFT) |
>> -                NV40_FP_OP_OUT_NONE |
>> -                (NVFX_FP_PRECISION_FP16 << NVFX_FP_OP_PRECISION_SHIFT);
>> -        /* Use .xxxx swizzle so that we check only src[0].x*/
>> -        hw[1] = (NVFX_SWZ_IDENTITY << NVFX_FP_OP_COND_SWZ_X_SHIFT) |
>> -                        (NVFX_FP_OP_COND_FL << NVFX_FP_OP_COND_SHIFT);
>> -        hw[2] = NV40_FP_OP_OPCODE_IS_BRANCH; /* | else_offset */
>> -        hw[3] = 0; /* | endif_offset */
>> -        reloc.target = target;
>> -        reloc.location = fpc->inst_offset + 2;
>> -        util_dynarray_append(&fpc->label_relocs, struct nvfx_relocation, reloc);
>> -        reloc.target = target;
>> -        reloc.location = fpc->inst_offset + 3;
>> -        util_dynarray_append(&fpc->label_relocs, struct nvfx_relocation, reloc);
>> -}
>> -
>>   static void
>>   nv40_fp_brk(struct nvfx_fpc *fpc)
>>   {
>> @@ -1201,17 +1175,3 @@ out_err:
>>      tgsi_dump(fp->pipe.tokens, 0);
>>      goto out;
>>   }
>> -
>> -static inline void
>> -nvfx_fp_memcpy(void* dst, const void* src, size_t len)
> This can go though, assuming it really is unused. (Wow, what a
> horrible function. Makes me think we *should* be using it somewhere
> but aren't.)

Yes.

>
>> -{
>> -#ifndef PIPE_ARCH_BIG_ENDIAN
>> -   memcpy(dst, src, len);
>> -#else
>> -   size_t i;
>> -   for(i = 0; i < len; i += 4) {
>> -      uint32_t v = *(uint32_t*)((char*)src + i);
>> -      *(uint32_t*)((char*)dst + i) = (v >> 16) | (v << 16);
>> -   }
>> -#endif
>> -}
>> --
>> 2.4.0
>>
>> _______________________________________________
>> mesa-dev mailing list
>> mesa-dev at lists.freedesktop.org
>> http://lists.freedesktop.org/mailman/listinfo/mesa-dev