diff options
Diffstat (limited to 'src/mesa/main')
| -rw-r--r-- | src/mesa/main/mtypes.h | 1 | ||||
| -rw-r--r-- | src/mesa/main/shaderapi.c | 13 |
2 files changed, 3 insertions, 11 deletions
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index 96fd914190..bcd324b443 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -2199,6 +2199,7 @@ struct gl_shader_compiler_options GLboolean EmitNoFunctions; GLboolean EmitNoCont; /**< Emit CONT opcode? */ GLboolean EmitNoMainReturn; /**< Emit CONT/RET opcodes? */ + GLboolean EmitNoNoise; /**< Emit NOISE opcodes? */ GLuint MaxUnrollIterations; diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c index c32c09f8d4..c25d2a1974 100644 --- a/src/mesa/main/shaderapi.c +++ b/src/mesa/main/shaderapi.c @@ -96,21 +96,12 @@ _mesa_init_shader_state(GLcontext *ctx) */ struct gl_shader_compiler_options options; GLuint i; - options.EmitHighLevelInstructions = GL_TRUE; - options.EmitCondCodes = GL_FALSE; - options.EmitComments = GL_FALSE; - options.EmitNoIfs = GL_FALSE; - options.EmitNoLoops = GL_FALSE; - options.EmitNoFunctions = GL_FALSE; - options.EmitNoCont = GL_FALSE; - options.EmitNoMainReturn = GL_FALSE; + + memset(&options, 0, sizeof(options)); options.MaxUnrollIterations = 32; /* Default pragma settings */ - options.DefaultPragmas.IgnoreOptimize = GL_FALSE; - options.DefaultPragmas.IgnoreDebug = GL_FALSE; options.DefaultPragmas.Optimize = GL_TRUE; - options.DefaultPragmas.Debug = GL_FALSE; for(i = 0; i < MESA_SHADER_TYPES; ++i) memcpy(&ctx->ShaderCompilerOptions[i], &options, sizeof(options)); |