diff options
| author | Christoph Bumiller <e0425955@student.tuwien.ac.at> | 2010-03-11 17:27:12 +0100 |
|---|---|---|
| committer | Christoph Bumiller <e0425955@student.tuwien.ac.at> | 2010-03-11 17:27:12 +0100 |
| commit | 4da5d369fb6a724a03a3c2e79ed6623980fc72ac (patch) | |
| tree | cf842048014dda8464e08b79151f9b25fa508ea6 /src/gallium/drivers/nv50/nv50_state_validate.c | |
| parent | 530b9910c2fd25344e6d28b6d9aa0eaad31618e7 (diff) | |
nv50: fix damage from merging master into sampler-view
Fixed the state array sizes at 3 (instead of PIPE_SHADER_TYPES)
because we'll never have domain and hull shaders on nv50; also
the numbering doesn't correspond to the hw numbering.
Diffstat (limited to 'src/gallium/drivers/nv50/nv50_state_validate.c')
| -rw-r--r-- | src/gallium/drivers/nv50/nv50_state_validate.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/gallium/drivers/nv50/nv50_state_validate.c b/src/gallium/drivers/nv50/nv50_state_validate.c index 2c8e7ca798..63d73b5ce8 100644 --- a/src/gallium/drivers/nv50/nv50_state_validate.c +++ b/src/gallium/drivers/nv50/nv50_state_validate.c @@ -310,15 +310,13 @@ validate_sampler(struct nv50_context *nv50) struct nouveau_stateobj *so; unsigned nr = 0, i; - for (i = 0; i < PIPE_SHADER_TYPES; ++i) + for (i = 0; i < 3; ++i) nr += nv50->sampler_nr[i]; - so = so_new(1 + 5 * PIPE_SHADER_TYPES, - 1 + 19 * PIPE_SHADER_TYPES + nr * 8, - PIPE_SHADER_TYPES * 2); + so = so_new(1 + 5 * 3, 1 + 19 * 3 + nr * 8, 3 * 2); - nv50_validate_samplers(nv50, so, PIPE_SHADER_VERTEX); - nv50_validate_samplers(nv50, so, PIPE_SHADER_FRAGMENT); + nv50_validate_samplers(nv50, so, 0); /* VP */ + nv50_validate_samplers(nv50, so, 2); /* FP */ so_method(so, tesla, 0x1334, 1); /* flush TSC */ so_data (so, 0); |