fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 15:48:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Revert "intel: Add some defense against buffer allocation failure for subimage blits"

Browse source 
This reverts commit de7678ef52.

The conversion from using drm_intel_bo_alloc_tiled to a plain
drm_intel_bo_alloc forgot that the tiled variant adjusts the
allocation height even for TILING_NONE.

Reported-by: Dave Airlie <airlied@redhat.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=35786
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2011-03-30 10:54:31 +01:00
parent 167d35c303
commit f5a9a0bc22
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/mesa/drivers/dri/intel/intel_tex_subimage.c
View file

@ -90,19 +90,19 @@ intelTexSubimage(struct gl_context * ctx,
intel->gen < 6 && target == GL_TEXTURE_2D &&
drm_intel_bo_busy(dst_bo))
{
dstRowStride = width * intelImage->mt->cpp;
temp_bo = drm_intel_bo_alloc(intel->bufmgr, "subimage blit bo",
dstRowStride * height, 0);
if (!temp_bo)
return;
if (drm_intel_gem_bo_map_gtt(temp_bo)) {
drm_intel_bo_unreference(temp_bo);
return;
}
unsigned long pitch;
uint32_t tiling_mode = I915_TILING_NONE;
temp_bo = drm_intel_bo_alloc_tiled(intel->bufmgr,
"subimage blit bo",
width, height,
intelImage->mt->cpp,
&tiling_mode,
&pitch,
0);
drm_intel_gem_bo_map_gtt(temp_bo);
texImage->Data = temp_bo->virtual;
texImage->ImageOffsets[0] = 0;
dstRowStride = pitch;
intel_miptree_get_image_offset(intelImage->mt, level,
intelImage->face, 0,