remove final imports.h and imports.c bits

[mesa.git] / src / mesa / drivers / dri / i965 / intel_pixel_bitmap.c

diff --git a/src/mesa/drivers/dri/i965/intel_pixel_bitmap.c b/src/mesa/drivers/dri/i965/intel_pixel_bitmap.c
index 33ed3eb6f4ddb535b6090ca6fc9ec73c748d5de5..3a99bd8968bcafba055fcd253b0bc6da4860e611 100644 (file)
--- a/src/mesa/drivers/dri/i965/intel_pixel_bitmap.c
+++ b/src/mesa/drivers/dri/i965/intel_pixel_bitmap.c
@@ -208,7 +208,7 @@ do_blit_bitmap( struct gl_context *ctx,
 
    irb = intel_renderbuffer(fb->_ColorDrawBuffers[0]);
 
-   if (_mesa_is_bufferobj(unpack->BufferObj)) {
+   if (unpack->BufferObj) {
       bitmap = map_pbo(ctx, width, height, unpack, bitmap);
       if (bitmap == NULL)
         return true;   /* even though this is an error, we're done */
@@ -292,7 +292,7 @@ do_blit_bitmap( struct gl_context *ctx,
                                                (GLubyte *)stipple,
                                                sz,
                                                color,
-                                               irb->mt->surf.row_pitch,
+                                               irb->mt->surf.row_pitch_B,
                                                irb->mt->bo,
                                                irb->mt->offset,
                                                irb->mt->surf.tiling,
@@ -312,7 +312,7 @@ out:
    if (unlikely(INTEL_DEBUG & DEBUG_SYNC))
       intel_batchbuffer_flush(brw);
 
-   if (_mesa_is_bufferobj(unpack->BufferObj)) {
+   if (unpack->BufferObj) {
       /* done with PBO so unmap it now */
       ctx->Driver.UnmapBuffer(ctx, unpack->BufferObj, MAP_INTERNAL);
    }