diff options
| author | Ben Skeggs <skeggsb@gmail.com> | 2008-03-13 13:39:05 +1100 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2008-03-13 13:39:05 +1100 |
| commit | 03ec66375889f049b09f39ba98515aa35ac48164 (patch) | |
| tree | e149d8defb52b1252af982b459902ee0800b17cd /src/gallium/drivers/i915simple/i915_state_sampler.c | |
| parent | bd4fe0e87c1b979973d9a76aa48de5fbbb8d52b7 (diff) | |
| parent | 2366bb1baf2e9ae5b6ecf19f66ae9e0a4b0d2f36 (diff) | |
Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1
Diffstat (limited to 'src/gallium/drivers/i915simple/i915_state_sampler.c')
| -rw-r--r-- | src/gallium/drivers/i915simple/i915_state_sampler.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/gallium/drivers/i915simple/i915_state_sampler.c b/src/gallium/drivers/i915simple/i915_state_sampler.c index 9c1a5bbbd6..9dbb1b1b23 100644 --- a/src/gallium/drivers/i915simple/i915_state_sampler.c +++ b/src/gallium/drivers/i915simple/i915_state_sampler.c @@ -106,7 +106,8 @@ void i915_update_samplers( struct i915_context *i915 ) i915->current.sampler_enable_nr = 0; i915->current.sampler_enable_flags = 0x0; - for (unit = 0; unit < I915_TEX_UNITS; unit++) { + for (unit = 0; unit < i915->num_textures && unit < i915->num_samplers; + unit++) { /* determine unit enable/disable by looking for a bound texture */ /* could also examine the fragment program? */ if (i915->texture[unit]) { @@ -219,7 +220,8 @@ i915_update_textures(struct i915_context *i915) { uint unit; - for (unit = 0; unit < I915_TEX_UNITS; unit++) { + for (unit = 0; unit < i915->num_textures && unit < i915->num_samplers; + unit++) { /* determine unit enable/disable by looking for a bound texture */ /* could also examine the fragment program? */ if (i915->texture[unit]) { |