summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2011-02-02 18:11:27 -0700
committerBrian Paul <brianp@vmware.com>2011-02-21 17:31:48 -0700
commit652ceece0e01be9e481b468359c32b8a4506b661 (patch)
treefb54f1796a0822743ff337c07978bde317a0c4a6 /src
parente39aa1966b95537b31d58740e0907c824ac65430 (diff)
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. (cherry picked from commit d087cfaabf386c462329fb62f54311523a89f106)
Diffstat (limited to 'src')
-rw-r--r--src/gallium/auxiliary/cso_cache/cso_context.c2
1 files changed, 1 insertions, 1 deletions
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;