diff options
author | Samuel Pitoiset <[email protected]> | 2016-03-15 13:16:44 +0100 |
---|---|---|
committer | Samuel Pitoiset <[email protected]> | 2016-03-19 18:00:59 +0100 |
commit | d86933e6f42b9c2f5bb617c66c91795c560a9abd (patch) | |
tree | 5eb40f2cb06d2c54478a9f0903d57ed430b88c73 /src/gallium/drivers/nouveau/nvc0/nvc0_program.c | |
parent | e05492fd7f0e1a9454482a9174f5870b8cb5a41e (diff) |
nv50,nvc0: replace resInfoCBSlot by auxCBSlot
Having two different variables for the driver constant buffer slot
is confusing and really useless.
Signed-off-by: Samuel Pitoiset <[email protected]>
Acked-by: Ilia Mirkin <[email protected]>
Acked-by: Pierre Moreau <[email protected]>
Diffstat (limited to 'src/gallium/drivers/nouveau/nvc0/nvc0_program.c')
-rw-r--r-- | src/gallium/drivers/nouveau/nvc0/nvc0_program.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_program.c b/src/gallium/drivers/nouveau/nvc0/nvc0_program.c index bc884d6c08f..48e3475a95f 100644 --- a/src/gallium/drivers/nouveau/nvc0/nvc0_program.c +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_program.c @@ -540,12 +540,11 @@ nvc0_program_translate(struct nvc0_program *prog, uint16_t chipset, if (prog->type == PIPE_SHADER_COMPUTE) { if (chipset >= NVISA_GK104_CHIPSET) { - info->io.resInfoCBSlot = 0; + info->io.auxCBSlot = 0; info->io.texBindBase = NVE4_CP_INPUT_TEX(0); info->io.suInfoBase = NVE4_CP_INPUT_SUF(0); info->prop.cp.gridInfoBase = NVE4_CP_INPUT_GRID_INFO(0); } else { - info->io.resInfoCBSlot = 15; info->io.suInfoBase = 512; } info->io.msInfoCBSlot = 0; @@ -555,7 +554,6 @@ nvc0_program_translate(struct nvc0_program *prog, uint16_t chipset, info->io.texBindBase = 0x20; info->io.suInfoBase = 0; /* TODO */ } - info->io.resInfoCBSlot = 15; info->io.sampleInfoBase = 256 + 128; info->io.suInfoBase = 512; info->io.msInfoCBSlot = 15; |