More GLSL code:

- add x86 code generator;
- add full support for uniforms in ARB_shader_objects;
- add assembly instruction: global_addr;
- reorganize #includes;
- built-in uniforms accessed by index, rather than by name;
- add some entries to x86sse rtasm;
- add configurations to VC6 projects: 'Release x86' and 'Debug x86';
- #define SLANG_X86 active only on VC6 x86 builds;
- introduce code export table for a shader;
- remove GNU license from the noise library;

1 files changed, 2 insertions, 6 deletions

diff --git a/src/mesa/shader/slang/slang_assemble.c b/src/mesa/shader/slang/slang_assemble.c
index 2e1e13d1f5d..b24d3183841 100644
--- a/src/mesa/shader/slang/slang_assemble.c
+++ b/src/mesa/shader/slang/slang_assemble.c
@@ -29,13 +29,9 @@
  */

 

 #include "imports.h"

-#include "slang_utility.h"

 #include "slang_assemble.h"

+#include "slang_compile.h"

 #include "slang_storage.h"

-#include "slang_assemble_typeinfo.h"

-#include "slang_assemble_conditional.h"

-#include "slang_assemble_assignment.h"

-#include "slang_execute.h"

 

 /* slang_assembly */

 

@@ -1138,7 +1134,7 @@ GLboolean _slang_assemble_operation (slang_assemble_ctx *A, slang_operation *op,
 			/* push the variable's address */

 			if (var->global)

 			{

-				if (!PLAB (A->file, slang_asm_addr_push, var->address))

+				if (!PLAB (A->file, slang_asm_global_addr, var->address))

 					return GL_FALSE;

 			}

 			else