r300/compiler: do not use copy propagation if SaturateMode is used

[mesa.git] / src / mesa / drivers / dri / i915 / i830_vtbl.c

diff --git a/src/mesa/drivers/dri/i915/i830_vtbl.c b/src/mesa/drivers/dri/i915/i830_vtbl.c
index be96419ff196951aec89c58cf764e2d97913318e..0775d7fe943034a4bf16cc62c6c91e0d3a3f0f1d 100644 (file)
--- a/src/mesa/drivers/dri/i915/i830_vtbl.c
+++ b/src/mesa/drivers/dri/i915/i830_vtbl.c
@@ -415,7 +415,7 @@ i830_emit_state(struct intel_context *intel)
    struct i830_hw_state *state = &i830->state;
    int i, count;
    GLuint dirty;
-   dri_bo *aper_array[3 + I830_TEX_UNITS];
+   drm_intel_bo *aper_array[3 + I830_TEX_UNITS];
    int aper_count;
    GET_CURRENT_CONTEXT(ctx);
    BATCH_LOCALS;
@@ -576,7 +576,7 @@ i830_destroy_context(struct intel_context *intel)
 
    for (i = 0; i < I830_TEX_UNITS; i++) {
       if (i830->state.tex_buffer[i] != NULL) {
-        dri_bo_unreference(i830->state.tex_buffer[i]);
+        drm_intel_bo_unreference(i830->state.tex_buffer[i]);
         i830->state.tex_buffer[i] = NULL;
       }
    }