From: Alan Hourihane <alanh@vmware.com>
Date: Wed, 14 Jan 2009 23:33:41 +0000 (+0000)
Subject: Merge commit 'origin/master' into gallium-0.2
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=658b1bdb1cc5f9910be910dc156a2e81ed999756;p=mesa.git

Merge commit 'origin/master' into gallium-0.2

Conflicts:
	docs/install.html
	docs/relnotes-7.3.html
	src/mesa/shader/slang/slang_codegen.c
	src/mesa/shader/slang/slang_compile.c
	src/mesa/shader/slang/slang_emit.c
	src/mesa/shader/slang/slang_preprocess.c
	src/mesa/shader/slang/slang_preprocess.h
---

658b1bdb1cc5f9910be910dc156a2e81ed999756
diff --cc src/mesa/shader/slang/slang_preprocess.c
index 76e757cb381,cd79c8b94a6..d6b52535119
--- a/src/mesa/shader/slang/slang_preprocess.c
+++ b/src/mesa/shader/slang/slang_preprocess.c
@@@ -866,7 -923,8 +923,12 @@@ static GLboolea
  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__",
@@@ -888,6 -946,7 +950,10 @@@
     }
  
     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++) {
@@@ -1223,7 -1303,8 +1310,12 @@@ GLboolea
  _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;
@@@ -1239,7 -1320,7 +1331,11 @@@
        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;