mesa: Add a new function for getting the nonconst sampler array index

[mesa.git] / src / mesa / program / prog_parameter_layout.c

diff --git a/src/mesa/program/prog_parameter_layout.c b/src/mesa/program/prog_parameter_layout.c
index 28fca3b92d917bbb45d7c6434f547d48d9bf65b7..e83469059c598a97e71add4bdddbac243889d9d2 100644 (file)
--- a/src/mesa/program/prog_parameter_layout.c
+++ b/src/mesa/program/prog_parameter_layout.c
@@ -138,6 +138,7 @@ _mesa_layout_parameters(struct asm_parser_state *state)
                      inst->SrcReg[i].Symbol->param_binding_length);
 
               if (new_begin < 0) {
+                 _mesa_free_parameter_list(layout);
                  return GL_FALSE;
               }
 
@@ -172,7 +173,7 @@ _mesa_layout_parameters(struct asm_parser_state *state)
            continue;
         }
 
-        if ((inst->SrcReg[i].Base.File <= PROGRAM_VARYING )
+        if ((inst->SrcReg[i].Base.File <= PROGRAM_OUTPUT)
             || (inst->SrcReg[i].Base.File >= PROGRAM_WRITE_ONLY)) {
            continue;
         }