From bb61bfc90e25915ca6ece3daee7dc644f6b4f78d Mon Sep 17 00:00:00 2001 From: Pierre Moreau Date: Sat, 17 Apr 2021 22:36:31 +0200 Subject: [PATCH] nv50: Rename interps to fixups This matches the denomination used in nvc0, and finishes the name change that started in f5fe9030. Reviewed-by: Karol Herbst Reviewed-by: Ilia Mirkin Signed-off-by: Pierre Moreau Part-of: --- src/gallium/drivers/nouveau/nv50/nv50_program.c | 8 ++++---- src/gallium/drivers/nouveau/nv50/nv50_program.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/gallium/drivers/nouveau/nv50/nv50_program.c b/src/gallium/drivers/nouveau/nv50/nv50_program.c index 64c246c247a..e1f9d9fefbf 100644 --- a/src/gallium/drivers/nouveau/nv50/nv50_program.c +++ b/src/gallium/drivers/nouveau/nv50/nv50_program.c @@ -403,7 +403,7 @@ nv50_program_translate(struct nv50_program *prog, uint16_t chipset, prog->code = info_out.bin.code; prog->code_size = info_out.bin.codeSize; prog->relocs = info_out.bin.relocData; - prog->interps = info_out.bin.fixupData; + prog->fixups = info_out.bin.fixupData; prog->max_gpr = MAX2(4, (info_out.bin.maxGPR >> 1) + 1); prog->tls_space = info_out.bin.tlsSpace; prog->cp.smem_size = info_out.bin.smemSize; @@ -522,8 +522,8 @@ nv50_program_upload_code(struct nv50_context *nv50, struct nv50_program *prog) if (prog->relocs) nv50_ir_relocate_code(prog->relocs, prog->code, prog->code_base, 0, 0); - if (prog->interps) - nv50_ir_apply_fixups(prog->interps, prog->code, + if (prog->fixups) + nv50_ir_apply_fixups(prog->fixups, prog->code, prog->fp.force_persample_interp, false /* flatshade */, prog->fp.alphatest - 1, @@ -551,7 +551,7 @@ nv50_program_destroy(struct nv50_context *nv50, struct nv50_program *p) FREE(p->code); FREE(p->relocs); - FREE(p->interps); + FREE(p->fixups); FREE(p->so); memset(p, 0, sizeof(*p)); diff --git a/src/gallium/drivers/nouveau/nv50/nv50_program.h b/src/gallium/drivers/nouveau/nv50/nv50_program.h index 49ec95e4e03..d89cd9d13d2 100644 --- a/src/gallium/drivers/nouveau/nv50/nv50_program.h +++ b/src/gallium/drivers/nouveau/nv50/nv50_program.h @@ -115,7 +115,7 @@ struct nv50_program { bool mul_zero_wins; void *relocs; /* relocation records */ - void *interps; /* interpolation records */ + void *fixups; /* interpolation records */ struct nouveau_heap *mem;