Please ignore this patch I already sent it out by itself and its been
reviewed and pushed. Its not really related to this series its more of a
clean up before the uniform work.
On Mon, 2014-05-12 at 21:16 +1000, Timothy Arceri wrote:
> Signed-off-by: Timothy Arceri <t_arc...@yahoo.com.au>
> ---
> src/glsl/link_uniforms.cpp | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/src/glsl/link_uniforms.cpp b/src/glsl/link_uniforms.cpp
> index 29dc0b1..c7147e0 100644
> --- a/src/glsl/link_uniforms.cpp
> +++ b/src/glsl/link_uniforms.cpp
> @@ -308,8 +308,7 @@ private:
> */
> const unsigned values = values_for_type(type);
> if (type->contains_sampler()) {
> - this->num_shader_samplers +=
> - type->is_array() ? type->array_size() : 1;
> + this->num_shader_samplers += values;
> } else if (type->contains_image()) {
> this->num_shader_images += values;
>
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
