Merge branch 'master' into i915-unification

[mesa.git] / src / mesa / drivers / dri / i915tex / i830_texstate.c

diff --git a/src/mesa/drivers/dri/i915tex/i830_texstate.c b/src/mesa/drivers/dri/i915tex/i830_texstate.c
index 0d3f053226ff8c5748fd2bfa67eb9a91236ccb0a..7613b9d2a6f9bd8664d0f33129b12f1382597504 100644 (file)
--- a/src/mesa/drivers/dri/i915tex/i830_texstate.c
+++ b/src/mesa/drivers/dri/i915tex/i830_texstate.c
@@ -124,7 +124,7 @@ i830_update_tex_unit(struct intel_context *intel, GLuint unit, GLuint ss3)
    /*We need to refcount these. */
 
    if (i830->state.tex_buffer[unit] != NULL) {
-       driBOUnReference(i830->state.tex_buffer[unit]);
+       dri_bo_unreference(i830->state.tex_buffer[unit]);
        i830->state.tex_buffer[unit] = NULL;
    }
 
@@ -155,8 +155,8 @@ i830_update_tex_unit(struct intel_context *intel, GLuint unit, GLuint ss3)
 
       pitch = intelObj->pitchOverride;
    } else {
-      i830->state.tex_buffer[unit] = driBOReference(intelObj->mt->region->
-                                                   buffer);
+      dri_bo_reference(intelObj->mt->region->buffer);
+      i830->state.tex_buffer[unit] = intelObj->mt->region->buffer;
       i830->state.tex_offset[unit] = intel_miptree_image_offset(intelObj->mt,
                                                                0, intelObj->
                                                                firstLevel);
@@ -324,7 +324,7 @@ i830UpdateTextureState(struct intel_context *intel)
             I830_ACTIVESTATE(i830, I830_UPLOAD_TEX(i), GL_FALSE);
 
         if (i830->state.tex_buffer[i] != NULL) {
-           driBOUnReference(i830->state.tex_buffer[i]);
+           dri_bo_unreference(i830->state.tex_buffer[i]);
            i830->state.tex_buffer[i] = NULL;
         }
          break;