[Mesa-dev] [PATCH] glsl: allow glsl_type::sampler_index() with images

Marek Olšák maraeo at gmail.com
Thu Mar 30 20:30:07 UTC 2017


Reviewed-by: Marek Olšák <marek.olsak at amd.com>

Marek

On Thu, Mar 30, 2017 at 12:33 AM, Samuel Pitoiset
<samuel.pitoiset at gmail.com> wrote:
> Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
> ---
>  src/compiler/glsl_types.cpp | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/src/compiler/glsl_types.cpp b/src/compiler/glsl_types.cpp
> index 405aa3679a..cf0fe71d1a 100644
> --- a/src/compiler/glsl_types.cpp
> +++ b/src/compiler/glsl_types.cpp
> @@ -315,7 +315,7 @@ glsl_type::sampler_index() const
>  {
>     const glsl_type *const t = (this->is_array()) ? this->fields.array : this;
>
> -   assert(t->is_sampler());
> +   assert(t->is_sampler() || t->is_image());
>
>     switch (t->sampler_dimensionality) {
>     case GLSL_SAMPLER_DIM_1D:
> --
> 2.12.1
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev


More information about the mesa-dev mailing list