From: Kenneth Graunke Date: Tue, 20 Sep 2011 06:47:56 +0000 (-0700) Subject: i965: Set MaxIfDepth to UINT_MAX on Gen6+ and 16 on prior generations. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=01f9fdc4acd28cc4630a3c71f2d007373f4d979c;p=mesa.git i965: Set MaxIfDepth to UINT_MAX on Gen6+ and 16 on prior generations. Commit 488fe51cf823ccd137c667f1e92dd86f8323b723 converted the EmitNoIfs flag to MaxIfDepth, an unsigned integer saying "flatten if-statements nested beyond this depth." Unfortunately, i965 left this initialized to 0, which made ir_to_mesa attempt to flatten all if-statements. We didn't notice right away because we usually throw away ir_to_mesa's code in favor of the native VS and FS backends...but this still creates a lot of unnecessary work. Signed-off-by: Kenneth Graunke --- diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c index c1b274fed62..95662dc932c 100644 --- a/src/mesa/drivers/dri/i965/brw_context.c +++ b/src/mesa/drivers/dri/i965/brw_context.c @@ -116,6 +116,7 @@ brwCreateContext(int api, /* We want the GLSL compiler to emit code that uses condition codes */ for (i = 0; i <= MESA_SHADER_FRAGMENT; i++) { + ctx->ShaderCompilerOptions[i].MaxIfDepth = intel->gen < 6 ? 16 : UINT_MAX; ctx->ShaderCompilerOptions[i].EmitCondCodes = true; ctx->ShaderCompilerOptions[i].EmitNVTempInitialization = true; ctx->ShaderCompilerOptions[i].EmitNoNoise = true;