mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2026-04-24 13:40:37 +02:00
cell: use util_surface_copy/fill()
This commit is contained in:
parent
93ad2d5a5e
commit
27ae1bcabf
1 changed files with 2 additions and 97 deletions
|
|
@ -25,108 +25,13 @@
|
|||
*
|
||||
**************************************************************************/
|
||||
|
||||
#include "pipe/p_defines.h"
|
||||
#include "pipe/p_inlines.h"
|
||||
#include "pipe/p_winsys.h"
|
||||
#include "util/u_memory.h"
|
||||
#include "util/u_rect.h"
|
||||
#include "util/u_tile.h"
|
||||
|
||||
#include "cell_context.h"
|
||||
#include "cell_surface.h"
|
||||
|
||||
|
||||
static void
|
||||
cell_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)
|
||||
{
|
||||
assert( dst->format == src->format );
|
||||
|
||||
pipe_copy_rect(pipe_surface_map(dst, PIPE_BUFFER_USAGE_CPU_WRITE),
|
||||
&dst->block,
|
||||
dst->stride,
|
||||
dstx, dsty,
|
||||
width, height,
|
||||
pipe_surface_map(src, PIPE_BUFFER_USAGE_CPU_READ),
|
||||
do_flip ? -src->stride : src->stride,
|
||||
srcx, do_flip ? height - 1 - srcy : srcy);
|
||||
|
||||
pipe_surface_unmap(src);
|
||||
pipe_surface_unmap(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
|
||||
cell_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_surface_map(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_surface_unmap( dst );
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
cell_init_surface_functions(struct cell_context *cell)
|
||||
{
|
||||
cell->pipe.surface_copy = cell_surface_copy;
|
||||
cell->pipe.surface_fill = cell_surface_fill;
|
||||
cell->pipe.surface_copy = util_surface_copy;
|
||||
cell->pipe.surface_fill = util_surface_fill;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue