summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakob Bornecrantz <jakob@vmware.com>2009-01-15 12:28:23 +0100
committerJakob Bornecrantz <jakob@vmware.com>2009-01-15 12:33:05 +0100
commit938f1e98043cc6c9cb6f204d022aef76c03bc210 (patch)
tree53e8eab3a5d1759691b62c00507fc2ae8711d299
parent658b1bdb1cc5f9910be910dc156a2e81ed999756 (diff)
mesa: Fix merge conflicts
-rw-r--r--src/mesa/shader/slang/slang_preprocess.c15
1 files changed, 0 insertions, 15 deletions
diff --git a/src/mesa/shader/slang/slang_preprocess.c b/src/mesa/shader/slang/slang_preprocess.c
index d6b5253511..cd79c8b94a 100644
--- a/src/mesa/shader/slang/slang_preprocess.c
+++ b/src/mesa/shader/slang/slang_preprocess.c
@@ -923,12 +923,8 @@ static GLboolean
preprocess_source (slang_string *output, const char *source,
grammar pid, grammar eid,
slang_info_log *elog,
-<<<<<<< HEAD:src/mesa/shader/slang/slang_preprocess.c
- const struct gl_extensions *extensions)
-=======
const struct gl_extensions *extensions,
struct gl_sl_pragmas *pragmas)
->>>>>>> origin/master:src/mesa/shader/slang/slang_preprocess.c
{
static const char *predefined[] = {
"__FILE__",
@@ -950,10 +946,7 @@ preprocess_source (slang_string *output, const char *source,
}
pp_state_init (&state, elog, extensions);
-<<<<<<< HEAD:src/mesa/shader/slang/slang_preprocess.c
-=======
pp_pragmas_init (pragmas);
->>>>>>> origin/master:src/mesa/shader/slang/slang_preprocess.c
/* add the predefined symbols to the symbol table */
for (i = 0; predefined[i]; i++) {
@@ -1310,12 +1303,8 @@ GLboolean
_slang_preprocess_directives(slang_string *output,
const char *input,
slang_info_log *elog,
-<<<<<<< HEAD:src/mesa/shader/slang/slang_preprocess.c
- const struct gl_extensions *extensions)
-=======
const struct gl_extensions *extensions,
struct gl_sl_pragmas *pragmas)
->>>>>>> origin/master:src/mesa/shader/slang/slang_preprocess.c
{
grammar pid, eid;
GLboolean success;
@@ -1331,11 +1320,7 @@ _slang_preprocess_directives(slang_string *output,
grammar_destroy (pid);
return GL_FALSE;
}
-<<<<<<< HEAD:src/mesa/shader/slang/slang_preprocess.c
- success = preprocess_source (output, input, pid, eid, elog, extensions);
-=======
success = preprocess_source (output, input, pid, eid, elog, extensions, pragmas);
->>>>>>> origin/master:src/mesa/shader/slang/slang_preprocess.c
grammar_destroy (eid);
grammar_destroy (pid);
return success;