diff options
| author | Matt Turner <[email protected]> | 2015-12-07 11:14:56 -0800 |
|---|---|---|
| committer | Matt Turner <[email protected]> | 2015-12-08 15:36:57 -0800 |
| commit | c200e606f7348a6d75e4cf72fb538f5d78d67649 (patch) | |
| tree | 77121559f194ea205ce2d3f7729cc6c9dfedbe42 /src/glsl | |
| parent | a9a0c693e5cfaf25fbda09d226d4965942baf348 (diff) | |
glsl: Allow binding of image variables with 420pack.
This interaction was missed in the addition of ARB_image_load_store.
Cc: "11.0 11.1" <[email protected]>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=93266
Reviewed-by: Ilia Mirkin <[email protected]>
Reviewed-by: Ian Romanick <[email protected]>
Diffstat (limited to 'src/glsl')
| -rw-r--r-- | src/glsl/ast_to_hir.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/glsl/ast_to_hir.cpp b/src/glsl/ast_to_hir.cpp index 8fcda63d95e..6d7e40fb2bb 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()) { assert(ctx->Const.MaxImageUnits <= MAX_IMAGE_UNITS); if (max_index >= ctx->Const.MaxImageUnits) { _mesa_glsl_error(loc, state, "Image binding %d exceeds the " |