softpipe: use the new util_surface_copy/fill() functions

This commit is contained in:
Brian Paul 2008-09-04 10:32:29 -06:00
parent 69897223a8
commit dd82c06ca3

View file

@ -25,132 +25,14 @@
*
**************************************************************************/
#include "pipe/p_defines.h"
#include "pipe/p_inlines.h"
#include "pipe/p_winsys.h"
#include "util/u_tile.h"
#include "util/u_rect.h"
#include "sp_context.h"
#include "sp_surface.h"
/**
* Copy a rectangular region from one surface to another.
* Surfaces must have same bpp.
*
* Note that it's always the case that Y=0=top of the raster.
* If do_flip is non-zero, the region being copied will be flipped vertically.
*
* Assumes all values are within bounds -- no checking at this level -
* do it higher up if required.
*/
static void
sp_surface_copy(struct pipe_context *pipe,
boolean do_flip,
struct pipe_surface *dst,
unsigned dstx, unsigned dsty,
struct pipe_surface *src,
unsigned srcx, unsigned srcy, unsigned width, unsigned height)
{
void *dst_map = pipe->screen->surface_map( pipe->screen,
dst,
PIPE_BUFFER_USAGE_CPU_WRITE );
const void *src_map = pipe->screen->surface_map( pipe->screen,
src,
PIPE_BUFFER_USAGE_CPU_READ );
assert(dst->block.size == src->block.size);
assert(dst->block.width == src->block.width);
assert(dst->block.height == src->block.height);
assert(src_map);
assert(dst_map);
/* If do_flip, invert src_y position and pass negative src stride */
pipe_copy_rect(dst_map,
&dst->block,
dst->stride,
dstx, dsty,
width, height,
src_map,
do_flip ? -(int) src->stride : src->stride,
srcx, srcy);
pipe->screen->surface_unmap(pipe->screen, src);
pipe->screen->surface_unmap(pipe->screen, dst);
}
static void *
get_pointer(struct pipe_surface *dst, void *dst_map, unsigned x, unsigned y)
{
return (char *)dst_map + y / dst->block.height * dst->stride + x / dst->block.width * dst->block.size;
}
#define UBYTE_TO_USHORT(B) ((B) | ((B) << 8))
/**
* Fill a rectangular sub-region. Need better logic about when to
* push buffers into AGP - will currently do so whenever possible.
*/
static void
sp_surface_fill(struct pipe_context *pipe,
struct pipe_surface *dst,
unsigned dstx, unsigned dsty,
unsigned width, unsigned height, unsigned value)
{
unsigned i, j;
void *dst_map = pipe->screen->surface_map( pipe->screen,
dst,
PIPE_BUFFER_USAGE_CPU_WRITE );
assert(dst->stride > 0);
switch (dst->block.size) {
case 1:
case 2:
case 4:
pipe_fill_rect(dst_map, &dst->block, dst->stride, dstx, dsty, width, height, value);
break;
case 8:
{
/* expand the 4-byte clear value to an 8-byte value */
ushort *row = (ushort *) get_pointer(dst, dst_map, dstx, dsty);
ushort val0 = UBYTE_TO_USHORT((value >> 0) & 0xff);
ushort val1 = UBYTE_TO_USHORT((value >> 8) & 0xff);
ushort val2 = UBYTE_TO_USHORT((value >> 16) & 0xff);
ushort val3 = UBYTE_TO_USHORT((value >> 24) & 0xff);
val0 = (val0 << 8) | val0;
val1 = (val1 << 8) | val1;
val2 = (val2 << 8) | val2;
val3 = (val3 << 8) | val3;
for (i = 0; i < height; i++) {
for (j = 0; j < width; j++) {
row[j*4+0] = val0;
row[j*4+1] = val1;
row[j*4+2] = val2;
row[j*4+3] = val3;
}
row += dst->stride/2;
}
}
break;
default:
assert(0);
break;
}
pipe->screen->surface_unmap(pipe->screen, dst);
}
void
sp_init_surface_functions(struct softpipe_context *sp)
{
sp->pipe.surface_copy = sp_surface_copy;
sp->pipe.surface_fill = sp_surface_fill;
sp->pipe.surface_copy = util_surface_copy;
sp->pipe.surface_fill = util_surface_fill;
}