diff options
| author | Eric Anholt <[email protected]> | 2013-06-12 15:49:43 -0700 |
|---|---|---|
| committer | Eric Anholt <[email protected]> | 2013-06-21 10:04:30 -0700 |
| commit | 0343f20e2f8cc8a588effb028c4043ed2a4744c0 (patch) | |
| tree | c36344509a10a034896ac6ebb6430f42a430b541 /src/mesa/main | |
| parent | 10c14d16d28c5e868b042e575aaaa922604e5e7e (diff) | |
mesa: Move the common _mesa_glsl_compile_shader() code to glsl/.
This code had no relation to ir_to_mesa.cpp, since it was also used by
intel and state_tracker, and most of it was duplicated with the standalone
compiler (which has periodically drifted from the Mesa copy).
v2: Split from the ir_to_mesa to shaderapi.c changes.
Acked-by: Paul Berry <[email protected]> (v1)
Reviewed-by: Kenneth Graunke <[email protected]>
Diffstat (limited to 'src/mesa/main')
| -rw-r--r-- | src/mesa/main/shaderapi.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c index d214204a60a..4cc0357b1a4 100644 --- a/src/mesa/main/shaderapi.c +++ b/src/mesa/main/shaderapi.c @@ -55,6 +55,7 @@ #include "../glsl/glsl_parser_extras.h" #include "../glsl/ir.h" #include "../glsl/ir_uniform.h" +#include "../glsl/program.h" /** Define this to enable shader substitution (see below) */ #define SHADER_SUBST 0 @@ -760,7 +761,7 @@ compile_shader(struct gl_context *ctx, GLuint shaderObj) /* this call will set the shader->CompileStatus field to indicate if * compilation was successful. */ - _mesa_glsl_compile_shader(ctx, sh); + _mesa_glsl_compile_shader(ctx, sh, false, false); if (ctx->Shader.Flags & GLSL_LOG) { _mesa_write_shader_to_file(sh); |