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, 7 insertions, 9 deletions

diff --git a/src/mesa/shader/slang/slang_assemble_conditional.h b/src/mesa/shader/slang/slang_assemble_conditional.h
index 9ea1ed265e..ef0c2172c9 100644
--- a/src/mesa/shader/slang/slang_assemble_conditional.h
+++ b/src/mesa/shader/slang/slang_assemble_conditional.h
@@ -25,25 +25,23 @@
 #if !defined SLANG_ASSEMBLE_CONDITIONAL_H

 #define SLANG_ASSEMBLE_CONDITIONAL_H

 

-#include "slang_assemble.h"

-

 #if defined __cplusplus

 extern "C" {

 #endif

 

-GLboolean _slang_assemble_logicaland (slang_assemble_ctx *, slang_operation *);

+GLboolean _slang_assemble_logicaland (slang_assemble_ctx *, struct slang_operation_ *);

 

-GLboolean _slang_assemble_logicalor (slang_assemble_ctx *, slang_operation *);

+GLboolean _slang_assemble_logicalor (slang_assemble_ctx *, struct slang_operation_ *);

 

-GLboolean _slang_assemble_select (slang_assemble_ctx *, slang_operation *);

+GLboolean _slang_assemble_select (slang_assemble_ctx *, struct slang_operation_ *);

 

-GLboolean _slang_assemble_for (slang_assemble_ctx *, slang_operation *);

+GLboolean _slang_assemble_for (slang_assemble_ctx *, struct slang_operation_ *);

 

-GLboolean _slang_assemble_do (slang_assemble_ctx *, slang_operation *);

+GLboolean _slang_assemble_do (slang_assemble_ctx *, struct slang_operation_ *);

 

-GLboolean _slang_assemble_while (slang_assemble_ctx *, slang_operation *);

+GLboolean _slang_assemble_while (slang_assemble_ctx *, struct slang_operation_ *);

 

-GLboolean _slang_assemble_if (slang_assemble_ctx *, slang_operation *);

+GLboolean _slang_assemble_if (slang_assemble_ctx *, struct slang_operation_ *);

 

 #ifdef __cplusplus

 }