diff options
| author | Eric Anholt <eric@anholt.net> | 2007-12-14 16:00:48 -0800 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2007-12-15 12:45:52 -0800 |
| commit | f5b3cd46202517c21fcfcec0102732411df1af18 (patch) | |
| tree | 96309dda2df142311a9086853dd7f7c37c94e33b /src/mesa/drivers/dri/i965/intel_mipmap_tree.c | |
| parent | 5e3ef623ee8a6f7ea25242908b76bd47e48f4781 (diff) | |
[965] Use shared intel_regions.c.
This adds (so far) unused PBO functions, and holding the lock while writing
to regions (which may be shared static screen regions).
Diffstat (limited to 'src/mesa/drivers/dri/i965/intel_mipmap_tree.c')
| -rw-r--r-- | src/mesa/drivers/dri/i965/intel_mipmap_tree.c | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c index edca84c64e..8cc54703e3 100644 --- a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c +++ b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c @@ -119,7 +119,7 @@ void intel_miptree_destroy( struct intel_context *intel, if (mt) { GLuint i; - intel_region_release(intel, &(mt->region)); + intel_region_release(&mt->region); for (i = 0; i < MAX_TEXTURE_LEVELS; i++) if (mt->level[i].image_offset) @@ -242,17 +242,16 @@ GLboolean intel_miptree_image_data(struct intel_context *intel, DBG("%s\n", __FUNCTION__); for (i = 0; i < depth; i++) { - if (!intel_region_data(intel, - dst->region, - dst_offset + dst_depth_offset[i], - 0, - 0, - src, - src_row_pitch, - 0, 0, /* source x,y */ - width, - height)) - return GL_FALSE; + intel_region_data(intel, + dst->region, + dst_offset + dst_depth_offset[i], + 0, + 0, + src, + src_row_pitch, + 0, 0, /* source x,y */ + width, + height); src += src_image_pitch; } return GL_TRUE; |