On 12/07/2015 03:35 PM, Matt Turner wrote: > This interaction was missed in the addition of ARB_image_load_store. > > Cc: "11.0 11.1" <mesa-sta...@lists.freedesktop.org> > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=93266 > --- > src/glsl/ast_to_hir.cpp | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/src/glsl/ast_to_hir.cpp b/src/glsl/ast_to_hir.cpp > index 8fcda63..6d7e40f 100644 > --- a/src/glsl/ast_to_hir.cpp > +++ b/src/glsl/ast_to_hir.cpp > @@ -2649,7 +2649,9 @@ apply_explicit_binding(struct _mesa_glsl_parse_state > *state, > > return; > } > - } else if (state->is_version(420, 310) && base_type->is_image()) { > + } else if ((state->is_version(420, 310) || > + state->ARB_shading_language_420pack_enable) && > + base_type->is_image()) {
This is just an open-coded version of has_420pack_or_es31 (added in patch 3), yeah? If so, I think I'd pull that addition to patch 1 and use it here. With that change, the series is Reviewed-by: Ian Romanick <ian.d.roman...@intel.com> > assert(ctx->Const.MaxImageUnits <= MAX_IMAGE_UNITS); > if (max_index >= ctx->Const.MaxImageUnits) { > _mesa_glsl_error(loc, state, "Image binding %d exceeds the " > _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev