AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cell: move tile-related code into new tile.[ch] files.

Browse Source
This commit is contained in:
Brian
2008-01-10 17:30:51 -07:00
parent 6c11485405
commit 02f6f9f8d4
6 changed files with 194 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mesa/pipe/cell/spu/Makefile
+4
View File
@@ -17,6 +17,7 @@ PROG_SPU_EMBED_O = $(PROG)_spu-embed.o
SOURCES = \
main.c \
tile.c \
tri.c
SPU_OBJECTS = $(SOURCES:.c=.o) \
@@ -40,6 +41,9 @@ $(PROG_SPU): $(SPU_OBJECTS)
main.o: main.c
$(SPU_CC) $(SPU_CFLAGS) -c main.c
tile.o: tile.c
$(SPU_CC) $(SPU_CFLAGS) -c tile.c
tri.o: tri.c
$(SPU_CC) $(SPU_CFLAGS) -c tri.c
src/mesa/pipe/cell/spu/main.c
+1 -82
View File
@@ -35,6 +35,7 @@
#include "main.h"
#include "tri.h"
#include "tile.h"
#include "pipe/cell/common.h"
#include "pipe/p_defines.h"
@@ -50,13 +51,6 @@ volatile struct cell_init_info init;
struct framebuffer fb;
uint ctile[TILE_SIZE][TILE_SIZE] ALIGN16_ATTRIB;
ushort ztile[TILE_SIZE][TILE_SIZE] ALIGN16_ATTRIB;
ubyte tile_status[MAX_HEIGHT/TILE_SIZE][MAX_WIDTH/TILE_SIZE] ALIGN16_ATTRIB;
ubyte tile_status_z[MAX_HEIGHT/TILE_SIZE][MAX_WIDTH/TILE_SIZE] ALIGN16_ATTRIB;
void
@@ -69,81 +63,6 @@ wait_on_mask(unsigned tagMask)
void
get_tile(const struct framebuffer *fb, uint tx, uint ty, uint *tile,
int tag, int zBuf)
{
const uint offset = ty * fb->width_tiles + tx;
const uint bytesPerTile = TILE_SIZE * TILE_SIZE * (zBuf ? 2 : 4);
const ubyte *src = zBuf ? fb->depth_start : fb->color_start;
src += offset * bytesPerTile;
ASSERT(tx < fb->width_tiles);
ASSERT(ty < fb->height_tiles);
ASSERT_ALIGN16(tile);
/*
printf("get_tile: dest: %p src: 0x%x size: %d\n",
tile, (unsigned int) src, bytesPerTile);
*/
mfc_get(tile, /* dest in local memory */
(unsigned int) src, /* src in main memory */
bytesPerTile,
tag,
0, /* tid */
0 /* rid */);
}
void
put_tile(const struct framebuffer *fb, uint tx, uint ty, const uint *tile,
int tag, int zBuf)
{
const uint offset = ty * fb->width_tiles + tx;
const uint bytesPerTile = TILE_SIZE * TILE_SIZE * (zBuf ? 2 : 4);
ubyte *dst = zBuf ? fb->depth_start : fb->color_start;
dst += offset * bytesPerTile;
ASSERT(tx < fb->width_tiles);
ASSERT(ty < fb->height_tiles);
ASSERT_ALIGN16(tile);
/*
printf("put_tile: src: %p dst: 0x%x size: %d\n",
tile, (unsigned int) dst, bytesPerTile);
*/
mfc_put((void *) tile, /* src in local memory */
(unsigned int) dst, /* dst in main memory */
bytesPerTile,
tag,
0, /* tid */
0 /* rid */);
}
void
clear_tile(uint tile[TILE_SIZE][TILE_SIZE], uint value)
{
uint i, j;
for (i = 0; i < TILE_SIZE; i++) {
for (j = 0; j < TILE_SIZE; j++) {
tile[i][j] = value;
}
}
}
void
clear_tile_z(ushort tile[TILE_SIZE][TILE_SIZE], uint value)
{
uint i, j;
for (i = 0; i < TILE_SIZE; i++) {
for (j = 0; j < TILE_SIZE; j++) {
tile[i][j] = value;
}
}
}
/**
* For tiles whose status is TILE_STATUS_CLEAR, write solid-filled
* tiles back to the main framebuffer.
src/mesa/pipe/cell/spu/main.h
+4 -35
View File
@@ -34,10 +34,6 @@
#include "pipe/cell/common.h"
#define MAX_WIDTH 1024
#define MAX_HEIGHT 1024
extern volatile struct cell_init_info init;
struct framebuffer {
@@ -56,9 +52,6 @@ struct framebuffer {
extern struct framebuffer fb;
extern uint ctile[TILE_SIZE][TILE_SIZE] ALIGN16_ATTRIB;
extern ushort ztile[TILE_SIZE][TILE_SIZE] ALIGN16_ATTRIB;
/* DMA TAGS */
@@ -71,34 +64,6 @@ extern ushort ztile[TILE_SIZE][TILE_SIZE] ALIGN16_ATTRIB;
#define TAG_WRITE_TILE_Z 15
#define TILE_STATUS_CLEAR 1
#define TILE_STATUS_DEFINED 2 /**< defined pixel data */
#define TILE_STATUS_DIRTY 3 /**< modified, but not put back yet */
extern ubyte tile_status[MAX_HEIGHT/TILE_SIZE][MAX_WIDTH/TILE_SIZE] ALIGN16_ATTRIB;
extern ubyte tile_status_z[MAX_HEIGHT/TILE_SIZE][MAX_WIDTH/TILE_SIZE] ALIGN16_ATTRIB;
void
wait_on_mask(unsigned tag);
void
get_tile(const struct framebuffer *fb, uint tx, uint ty, uint *tile,
int tag, int zBuf);
void
put_tile(const struct framebuffer *fb, uint tx, uint ty, const uint *tile,
int tag, int zBuf);
void
clear_tile(uint tile[TILE_SIZE][TILE_SIZE], uint value);
void
clear_tile_z(ushort tile[TILE_SIZE][TILE_SIZE], uint value);
/** The standard assert macro doesn't seem to work on SPUs */
#define ASSERT(x) \
if (!(x)) { \
@@ -108,4 +73,8 @@ clear_tile_z(ushort tile[TILE_SIZE][TILE_SIZE], uint value);
}
void
wait_on_mask(unsigned tag);
#endif /* MAIN_H */
src/mesa/pipe/cell/spu/tile.c
+115
View File
@@ -0,0 +1,115 @@
/**************************************************************************
*
* Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.
* All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
* without limitation the rights to use, copy, modify, merge, publish,
* distribute, sub license, and/or sell copies of the Software, and to
* permit persons to whom the Software is furnished to do so, subject to
* the following conditions:
*
* The above copyright notice and this permission notice (including the
* next paragraph) shall be included in all copies or substantial portions
* of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
* IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
* ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*
**************************************************************************/
#include "tile.h"
uint ctile[TILE_SIZE][TILE_SIZE] ALIGN16_ATTRIB;
ushort ztile[TILE_SIZE][TILE_SIZE] ALIGN16_ATTRIB;
ubyte tile_status[MAX_HEIGHT/TILE_SIZE][MAX_WIDTH/TILE_SIZE] ALIGN16_ATTRIB;
ubyte tile_status_z[MAX_HEIGHT/TILE_SIZE][MAX_WIDTH/TILE_SIZE] ALIGN16_ATTRIB;
void
get_tile(const struct framebuffer *fb, uint tx, uint ty, uint *tile,
int tag, int zBuf)
{
const uint offset = ty * fb->width_tiles + tx;
const uint bytesPerTile = TILE_SIZE * TILE_SIZE * (zBuf ? 2 : 4);
const ubyte *src = zBuf ? fb->depth_start : fb->color_start;
src += offset * bytesPerTile;
ASSERT(tx < fb->width_tiles);
ASSERT(ty < fb->height_tiles);
ASSERT_ALIGN16(tile);
/*
printf("get_tile: dest: %p src: 0x%x size: %d\n",
tile, (unsigned int) src, bytesPerTile);
*/
mfc_get(tile, /* dest in local memory */
(unsigned int) src, /* src in main memory */
bytesPerTile,
tag,
0, /* tid */
0 /* rid */);
}
void
put_tile(const struct framebuffer *fb, uint tx, uint ty, const uint *tile,
int tag, int zBuf)
{
const uint offset = ty * fb->width_tiles + tx;
const uint bytesPerTile = TILE_SIZE * TILE_SIZE * (zBuf ? 2 : 4);
ubyte *dst = zBuf ? fb->depth_start : fb->color_start;
dst += offset * bytesPerTile;
ASSERT(tx < fb->width_tiles);
ASSERT(ty < fb->height_tiles);
ASSERT_ALIGN16(tile);
/*
printf("put_tile: src: %p dst: 0x%x size: %d\n",
tile, (unsigned int) dst, bytesPerTile);
*/
mfc_put((void *) tile, /* src in local memory */
(unsigned int) dst, /* dst in main memory */
bytesPerTile,
tag,
0, /* tid */
0 /* rid */);
}
void
clear_tile(uint tile[TILE_SIZE][TILE_SIZE], uint value)
{
uint i, j;
for (i = 0; i < TILE_SIZE; i++) {
for (j = 0; j < TILE_SIZE; j++) {
tile[i][j] = value;
}
}
}
void
clear_tile_z(ushort tile[TILE_SIZE][TILE_SIZE], uint value)
{
uint i, j;
for (i = 0; i < TILE_SIZE; i++) {
for (j = 0; j < TILE_SIZE; j++) {
tile[i][j] = value;
}
}
}
src/mesa/pipe/cell/spu/tile.h
+69
View File
@@ -0,0 +1,69 @@
/**************************************************************************
*
* Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.
* All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
* without limitation the rights to use, copy, modify, merge, publish,
* distribute, sub license, and/or sell copies of the Software, and to
* permit persons to whom the Software is furnished to do so, subject to
* the following conditions:
*
* The above copyright notice and this permission notice (including the
* next paragraph) shall be included in all copies or substantial portions
* of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
* IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
* ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*
**************************************************************************/
#ifndef TILE_H
#define TILE_H
#include <libmisc.h>
#include <spu_mfcio.h>
#include "main.h"
#include "pipe/cell/common.h"
#define MAX_WIDTH 1024
#define MAX_HEIGHT 1024
extern uint ctile[TILE_SIZE][TILE_SIZE] ALIGN16_ATTRIB;
extern ushort ztile[TILE_SIZE][TILE_SIZE] ALIGN16_ATTRIB;
#define TILE_STATUS_CLEAR 1
#define TILE_STATUS_DEFINED 2 /**< defined pixel data */
#define TILE_STATUS_DIRTY 3 /**< modified, but not put back yet */
extern ubyte tile_status[MAX_HEIGHT/TILE_SIZE][MAX_WIDTH/TILE_SIZE] ALIGN16_ATTRIB;
extern ubyte tile_status_z[MAX_HEIGHT/TILE_SIZE][MAX_WIDTH/TILE_SIZE] ALIGN16_ATTRIB;
void
get_tile(const struct framebuffer *fb, uint tx, uint ty, uint *tile,
int tag, int zBuf);
void
put_tile(const struct framebuffer *fb, uint tx, uint ty, const uint *tile,
int tag, int zBuf);
void
clear_tile(uint tile[TILE_SIZE][TILE_SIZE], uint value);
void
clear_tile_z(ushort tile[TILE_SIZE][TILE_SIZE], uint value);
#endif /* TILE_H */
src/mesa/pipe/cell/spu/tri.c
+1
View File
@@ -45,6 +45,7 @@
#include "pipe/p_format.h"
#include "pipe/p_util.h"
#include "main.h"
#include "tile.h"
#include "tri.h"
/*