From f29e6a9e7e9827e7966d4b8e65c990a2a0842655 Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Sun, 7 Jun 2020 09:52:27 +1000 Subject: [PATCH] nvir/nir/gm107: split nir shader compiler options from gf100 We can enable some more things here vs earlier GPUs. v2: - make use of the shared function to generate compiler options Signed-off-by: Ben Skeggs Reviewed-by: Karol Herbst Part-of: --- src/gallium/drivers/nouveau/codegen/nv50_ir_from_nir.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_from_nir.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_from_nir.cpp index fcf811f59cb..93044f74072 100644 --- a/src/gallium/drivers/nouveau/codegen/nv50_ir_from_nir.cpp +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_from_nir.cpp @@ -3441,9 +3441,13 @@ nvir_nir_shader_compiler_options(int chipset) static const nir_shader_compiler_options gf100_nir_shader_compiler_options = nvir_nir_shader_compiler_options(NVISA_GF100_CHIPSET); +static const nir_shader_compiler_options gm107_nir_shader_compiler_options = +nvir_nir_shader_compiler_options(NVISA_GM107_CHIPSET); const nir_shader_compiler_options * nv50_ir_nir_shader_compiler_options(int chipset) { + if (chipset >= NVISA_GM107_CHIPSET) + return &gm107_nir_shader_compiler_options; return &gf100_nir_shader_compiler_options; } -- 2.30.2