From: Brian Paul <brianp@vmware.com>
Date: Thu, 3 Feb 2011 01:11:27 +0000 (-0700)
Subject: cso: fix loop bound in cso_set_vertex_samplers()
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d087cfaabf386c462329fb62f54311523a89f106;p=mesa.git

cso: fix loop bound in cso_set_vertex_samplers()

Before we were looping to nr_samplers, which is the number of fragment
samplers, not vertex samplers.

NOTE: This is a candidate for the 7.9 and 7.10 branches.
---

diff --git a/src/gallium/auxiliary/cso_cache/cso_context.c b/src/gallium/auxiliary/cso_cache/cso_context.c
index 58b022d531d..b983fa61c12 100644
--- a/src/gallium/auxiliary/cso_cache/cso_context.c
+++ b/src/gallium/auxiliary/cso_cache/cso_context.c
@@ -595,7 +595,7 @@ enum pipe_error cso_set_vertex_samplers(struct cso_context *ctx,
          error = temp;
    }
 
-   for ( ; i < ctx->nr_samplers; i++) {
+   for ( ; i < ctx->nr_vertex_samplers; i++) {
       temp = cso_single_vertex_sampler( ctx, i, NULL );
       if (temp != PIPE_OK)
          error = temp;