gbm: Create a gbm_device getter for stride

[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 a8885738321d64390fa938bbb87b919bb8a79c7b..282a367ad042ea25c4592316c5315abf412ad1f1 100644 (file)
--- a/src/mesa/program/prog_parameter_layout.c
+++ b/src/mesa/program/prog_parameter_layout.c
@@ -28,6 +28,7 @@
  * \author Ian Romanick <ian.d.romanick@intel.com>
  */
 
+#include "main/imports.h"
 #include "main/mtypes.h"
 #include "prog_parameter.h"
 #include "prog_parameter_layout.h"
@@ -137,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;
               }
 
@@ -171,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;
         }
@@ -181,7 +183,7 @@ _mesa_layout_parameters(struct asm_parser_state *state)
 
         switch (p->Type) {
         case PROGRAM_CONSTANT: {
-           const float *const v =
+           const gl_constant_value *const v =
               state->prog->Parameters->ParameterValues[idx];
 
            inst->Base.SrcReg[i].Index =
@@ -206,6 +208,7 @@ _mesa_layout_parameters(struct asm_parser_state *state)
       }
    }
 
+   layout->StateFlags = state->prog->Parameters->StateFlags;
    _mesa_free_parameter_list(state->prog->Parameters);
    state->prog->Parameters = layout;