summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2009-12-21 18:04:27 -0700
committerBrian Paul <brianp@vmware.com>2009-12-21 19:14:41 -0700
commitef171051349ac83695a9a8304d486e1adb503291 (patch)
tree1b2318f4238a3b5e5a08d1a0e29bf32edabd4d2e /src
parent3839f6768de601e915d5afb3a130ada25cc4620f (diff)
glsl: assorted clean-ups in slang_compile.c
Diffstat (limited to 'src')
-rw-r--r--src/mesa/shader/slang/slang_compile.c45
1 files changed, 9 insertions, 36 deletions
diff --git a/src/mesa/shader/slang/slang_compile.c b/src/mesa/shader/slang/slang_compile.c
index 19b8e517259..f60ad9ee385 100644
--- a/src/mesa/shader/slang/slang_compile.c
+++ b/src/mesa/shader/slang/slang_compile.c
@@ -2579,7 +2579,6 @@ compile_with_grammar(const char *source,
slang_info_log *infolog,
slang_code_unit *builtin,
struct gl_shader *shader,
- const struct gl_extensions *extensions,
struct gl_sl_pragmas *pragmas,
unsigned int shader_type,
unsigned int parsing_builtin)
@@ -2592,7 +2591,8 @@ compile_with_grammar(const char *source,
unsigned int maxVersion;
int result;
char errmsg[200] = "";
- unsigned int errline = 0;
+
+ assert(shader_type == 1 || shader_type == 2);
memset(&options, 0, sizeof(options));
@@ -2711,7 +2711,6 @@ compile_object(const char *source,
slang_unit_type type,
slang_info_log *infolog,
struct gl_shader *shader,
- const struct gl_extensions *extensions,
struct gl_sl_pragmas *pragmas)
{
slang_code_unit *builtins = NULL;
@@ -2792,11 +2791,8 @@ compile_object(const char *source,
}
/* disable language extensions */
-#if NEW_SLANG /* allow-built-ins */
- parsing_builtin = 1;
-#else
parsing_builtin = 0;
-#endif
+
builtins = object->builtin;
}
@@ -2807,40 +2803,12 @@ compile_object(const char *source,
infolog,
builtins,
shader,
- extensions,
pragmas,
shader_type,
parsing_builtin);
}
-static GLboolean
-compile_shader(GLcontext *ctx, slang_code_object * object,
- slang_unit_type type, slang_info_log * infolog,
- struct gl_shader *shader)
-{
-#if 0 /* for debug */
- _mesa_printf("********* COMPILE SHADER ***********\n");
- _mesa_printf("%s\n", shader->Source);
- _mesa_printf("************************************\n");
-#endif
-
- assert(shader->Program);
-
- _slang_code_object_dtr(object);
- _slang_code_object_ctr(object);
-
- return compile_object(shader->Source,
- object,
- type,
- infolog,
- shader,
- &ctx->Extensions,
- &shader->Pragmas);
-}
-
-
-
GLboolean
_slang_compile(GLcontext *ctx, struct gl_shader *shader)
{
@@ -2881,7 +2849,12 @@ _slang_compile(GLcontext *ctx, struct gl_shader *shader)
slang_info_log_construct(&info_log);
_slang_code_object_ctr(&obj);
- success = compile_shader(ctx, &obj, type, &info_log, shader);
+ success = compile_object(shader->Source,
+ &obj,
+ type,
+ &info_log,
+ shader,
+ &shader->Pragmas);
/* free shader's prev info log */
if (shader->InfoLog) {