diff options
-rw-r--r-- | src/mesa/shader/slang/slang_codegen.c | 2 | ||||
-rw-r--r-- | src/mesa/shader/slang/slang_compile.c | 1 | ||||
-rw-r--r-- | src/mesa/shader/slang/slang_emit.c | 6 | ||||
-rw-r--r-- | src/mesa/shader/slang/slang_link2.c | 5 |
4 files changed, 11 insertions, 3 deletions
diff --git a/src/mesa/shader/slang/slang_codegen.c b/src/mesa/shader/slang/slang_codegen.c index 40a27bc351..af543adf63 100644 --- a/src/mesa/shader/slang/slang_codegen.c +++ b/src/mesa/shader/slang/slang_codegen.c @@ -40,6 +40,8 @@ #include "slang_ir.h" #include "mtypes.h" #include "program.h" +#include "prog_instruction.h" +#include "prog_parameter.h" #include "slang_print.h" diff --git a/src/mesa/shader/slang/slang_compile.c b/src/mesa/shader/slang/slang_compile.c index a9c84abdce..463088fc5c 100644 --- a/src/mesa/shader/slang/slang_compile.c +++ b/src/mesa/shader/slang/slang_compile.c @@ -31,6 +31,7 @@ #include "imports.h" #include "context.h" #include "program.h" +#include "prog_parameter.h" #include "grammar_mesa.h" #include "slang_codegen.h" #include "slang_compile.h" diff --git a/src/mesa/shader/slang/slang_emit.c b/src/mesa/shader/slang/slang_emit.c index 29d9544ebe..104064fd17 100644 --- a/src/mesa/shader/slang/slang_emit.c +++ b/src/mesa/shader/slang/slang_emit.c @@ -33,7 +33,9 @@ #include "get.h" #include "macros.h" #include "program.h" -#include "program_instruction.h" +#include "prog_instruction.h" +#include "prog_parameter.h" +#include "prog_statevars.h" #include "slang_emit.h" @@ -554,6 +556,7 @@ static GLint slang_alloc_varying(struct gl_program *prog, const char *name) { GLint i = _mesa_add_varying(prog->Varying, name, 4); /* XXX fix size */ +#if 0 if (prog->Target == GL_VERTEX_PROGRAM_ARB) { #ifdef OLD_LINK i += VERT_RESULT_VAR0; @@ -570,6 +573,7 @@ slang_alloc_varying(struct gl_program *prog, const char *name) prog->InputsRead |= (1 << (i + FRAG_ATTRIB_VAR0)); #endif } +#endif return i; } diff --git a/src/mesa/shader/slang/slang_link2.c b/src/mesa/shader/slang/slang_link2.c index 76954e17a6..4b3588454c 100644 --- a/src/mesa/shader/slang/slang_link2.c +++ b/src/mesa/shader/slang/slang_link2.c @@ -33,7 +33,8 @@ #include "hash.h" #include "macros.h" #include "program.h" -#include "program_instruction.h" +#include "prog_instruction.h" +#include "prog_parameter.h" #include "shaderobjects.h" #include "slang_link.h" @@ -108,7 +109,7 @@ link_varying_vars(struct gl_linked_program *linked, struct gl_program *prog) if (inst->SrcReg[j].File == PROGRAM_VARYING) { inst->SrcReg[j].File = newFile; inst->SrcReg[j].Index = map[ inst->SrcReg[j].Index ] + firstVarying; - varsRead |= (1 << inst->DstReg.Index); + varsRead |= (1 << inst->SrcReg[j].Index); } } /* XXX update program OutputsWritten, InputsRead */ |