diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2013-12-06 09:09:42 +1000 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2013-12-06 11:28:45 +1000 |
commit | 92ceb327bad73cfde0b68aafb3921067351617fd (patch) | |
tree | 47661d29285a6d5b7c6d33b8d4a9478da70e26d7 /src/gallium/drivers/nouveau/codegen/nv50_ir_target_nvc0.cpp | |
parent | 26f3ff8a916d7315b2d6d23ee9e52d946b68a136 (diff) | |
download | external_mesa3d-92ceb327bad73cfde0b68aafb3921067351617fd.zip external_mesa3d-92ceb327bad73cfde0b68aafb3921067351617fd.tar.gz external_mesa3d-92ceb327bad73cfde0b68aafb3921067351617fd.tar.bz2 |
nvc0: fixup gk110 and up not being listed in various switch statements
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'src/gallium/drivers/nouveau/codegen/nv50_ir_target_nvc0.cpp')
-rw-r--r-- | src/gallium/drivers/nouveau/codegen/nv50_ir_target_nvc0.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_target_nvc0.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_target_nvc0.cpp index 47e9c55..1f3932e 100644 --- a/src/gallium/drivers/nouveau/codegen/nv50_ir_target_nvc0.cpp +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_target_nvc0.cpp @@ -46,12 +46,13 @@ TargetNVC0::TargetNVC0(unsigned int card) : Target(false, card >= 0xe4) void TargetNVC0::getBuiltinCode(const uint32_t **code, uint32_t *size) const { - switch (chipset & 0xf0) { + switch (chipset & ~0xf) { case 0xe0: *code = (const uint32_t *)&nve4_builtin_code[0]; *size = sizeof(nve4_builtin_code); break; case 0xf0: + case 0x100: *code = (const uint32_t *)&nvf0_builtin_code[0]; *size = sizeof(nvf0_builtin_code); break; @@ -67,9 +68,12 @@ TargetNVC0::getBuiltinOffset(int builtin) const { assert(builtin < NVC0_BUILTIN_COUNT); - switch (chipset & 0xf0) { - case 0xe0: return nve4_builtin_offsets[builtin]; - case 0xf0: return nvf0_builtin_offsets[builtin]; + switch (chipset & ~0xf) { + case 0xe0: + return nve4_builtin_offsets[builtin]; + case 0xf0: + case 0x100: + return nvf0_builtin_offsets[builtin]; default: return nvc0_builtin_offsets[builtin]; } |