summaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers/dri/i965/intel_tex_image.c
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2014-04-25 12:14:34 -0700
committerEric Anholt <eric@anholt.net>2014-05-01 15:12:27 -0700
commite3a9ca4563790f54976a969bf70cd5f45cbc4e13 (patch)
tree5c33cad869a259fbcc449248ca78ba1288faea6a /src/mesa/drivers/dri/i965/intel_tex_image.c
parent8435b60a3577d2d905eae189cd7e770500177e99 (diff)
downloadexternal_mesa3d-e3a9ca4563790f54976a969bf70cd5f45cbc4e13.zip
external_mesa3d-e3a9ca4563790f54976a969bf70cd5f45cbc4e13.tar.gz
external_mesa3d-e3a9ca4563790f54976a969bf70cd5f45cbc4e13.tar.bz2
i965: Replace the region in DRIimage with just a BO pointer and stride.
Regions aren't refcounted safely for multithreaded applications, and they're not terribly useful wrappers of a BO, so I'm trying to remove them. Even the stride I added here could probably be reduced to use of an existing field in the __DRIimageRec, but I want this to be as mechanical of a change as possible. Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Chad Versace <chad.versace@linux.intel.com>
Diffstat (limited to 'src/mesa/drivers/dri/i965/intel_tex_image.c')
-rw-r--r--src/mesa/drivers/dri/i965/intel_tex_image.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/i965/intel_tex_image.c b/src/mesa/drivers/dri/i965/intel_tex_image.c
index b7fab39..9e8b36e 100644
--- a/src/mesa/drivers/dri/i965/intel_tex_image.c
+++ b/src/mesa/drivers/dri/i965/intel_tex_image.c
@@ -403,11 +403,11 @@ intel_image_target_texture_2d(struct gl_context *ctx, GLenum target,
return;
}
- intel_set_texture_image_bo(ctx, texImage, image->region->bo,
+ intel_set_texture_image_bo(ctx, texImage, image->bo,
target, image->internal_format,
image->format, image->offset,
image->width, image->height,
- image->region->pitch,
+ image->pitch,
image->tile_x, image->tile_y);
}