i915: Fix the last of the stride/pitch changes
This commit is contained in:
@@ -64,10 +64,10 @@ i915_surface_copy(struct pipe_context *pipe,
|
|||||||
pipe_copy_rect(dst_map,
|
pipe_copy_rect(dst_map,
|
||||||
&dst->block,
|
&dst->block,
|
||||||
dst->stride,
|
dst->stride,
|
||||||
dstx, dsty,
|
dstx, dsty,
|
||||||
width, height,
|
width, height,
|
||||||
src_map,
|
src_map,
|
||||||
do_flip ? -(int) src->stride : src->stride,
|
do_flip ? -(int) src->stride : src->stride,
|
||||||
srcx, do_flip ? height - 1 - srcy : srcy);
|
srcx, do_flip ? height - 1 - srcy : srcy);
|
||||||
|
|
||||||
pipe->screen->surface_unmap(pipe->screen, src);
|
pipe->screen->surface_unmap(pipe->screen, src);
|
||||||
@@ -79,8 +79,8 @@ i915_surface_copy(struct pipe_context *pipe,
|
|||||||
i915_copy_blit( i915_context(pipe),
|
i915_copy_blit( i915_context(pipe),
|
||||||
do_flip,
|
do_flip,
|
||||||
dst->block.size,
|
dst->block.size,
|
||||||
(short) src->stride/src->block.size, src->buffer, src->offset,
|
(short) src->stride, src->buffer, src->offset,
|
||||||
(short) dst->stride/dst->block.size, dst->buffer, dst->offset,
|
(short) dst->stride, dst->buffer, dst->offset,
|
||||||
(short) srcx, (short) srcy, (short) dstx, (short) dsty, (short) width, (short) height );
|
(short) srcx, (short) srcy, (short) dstx, (short) dsty, (short) width, (short) height );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -106,10 +106,10 @@ i915_surface_fill(struct pipe_context *pipe,
|
|||||||
assert(dst->block.height == 1);
|
assert(dst->block.height == 1);
|
||||||
i915_fill_blit( i915_context(pipe),
|
i915_fill_blit( i915_context(pipe),
|
||||||
dst->block.size,
|
dst->block.size,
|
||||||
(short) dst->stride/dst->block.size,
|
(short) dst->stride,
|
||||||
dst->buffer, dst->offset,
|
dst->buffer, dst->offset,
|
||||||
(short) dstx, (short) dsty,
|
(short) dstx, (short) dsty,
|
||||||
(short) width, (short) height,
|
(short) width, (short) height,
|
||||||
value );
|
value );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -78,10 +78,10 @@ intelCreateSurface(struct intel_screen *intelScreen, struct pipe_winsys *winsys,
|
|||||||
templat.last_level = 0;
|
templat.last_level = 0;
|
||||||
templat.depth[0] = 1;
|
templat.depth[0] = 1;
|
||||||
templat.format = PIPE_FORMAT_A8R8G8B8_UNORM;
|
templat.format = PIPE_FORMAT_A8R8G8B8_UNORM;
|
||||||
templat.cpp = intelScreen->front.cpp;
|
|
||||||
templat.width[0] = intelScreen->front.width;
|
templat.width[0] = intelScreen->front.width;
|
||||||
templat.height[0] = intelScreen->front.height;
|
templat.height[0] = intelScreen->front.height;
|
||||||
pitch = intelScreen->front.pitch / intelScreen->front.cpp;
|
pf_get_block(templat.format, &templat.block);
|
||||||
|
pitch = intelScreen->front.pitch;
|
||||||
|
|
||||||
texture = screen->texture_blanket(screen,
|
texture = screen->texture_blanket(screen,
|
||||||
&templat,
|
&templat,
|
||||||
|
@@ -89,7 +89,7 @@ intelDisplaySurface(__DRIdrawablePrivate *dPriv,
|
|||||||
const drm_clip_rect_t *pbox = dPriv->pClipRects;
|
const drm_clip_rect_t *pbox = dPriv->pClipRects;
|
||||||
const int pitch = intelScreen->front.pitch / intelScreen->front.cpp;
|
const int pitch = intelScreen->front.pitch / intelScreen->front.cpp;
|
||||||
const int cpp = intelScreen->front.cpp;
|
const int cpp = intelScreen->front.cpp;
|
||||||
const int srcpitch = surf->pitch;
|
const int srcpitch = surf->stride / cpp;
|
||||||
int BR13, CMD;
|
int BR13, CMD;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user