filename | src/pvr2/tacore.c |
changeset | 189:615b70cfd729 |
next | 193:31151fcc3cb7 |
author | nkeynes |
date | Wed Aug 02 04:06:45 2006 +0000 (17 years ago) |
permissions | -rw-r--r-- |
last change | Issue 0003: TA Vertex compiler Initial implementation of the TA. Renderer hooked up to the TA "properly" now as well |
file | annotate | diff | log | raw |
nkeynes@189 | 1 | /** |
nkeynes@189 | 2 | * $Id: tacore.c,v 1.1 2006-08-02 04:06:45 nkeynes Exp $ |
nkeynes@189 | 3 | * |
nkeynes@189 | 4 | * PVR2 Tile Accelerator implementation |
nkeynes@189 | 5 | * |
nkeynes@189 | 6 | * Copyright (c) 2005 Nathan Keynes. |
nkeynes@189 | 7 | * |
nkeynes@189 | 8 | * This program is free software; you can redistribute it and/or modify |
nkeynes@189 | 9 | * it under the terms of the GNU General Public License as published by |
nkeynes@189 | 10 | * the Free Software Foundation; either version 2 of the License, or |
nkeynes@189 | 11 | * (at your option) any later version. |
nkeynes@189 | 12 | * |
nkeynes@189 | 13 | * This program is distributed in the hope that it will be useful, |
nkeynes@189 | 14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
nkeynes@189 | 15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
nkeynes@189 | 16 | * GNU General Public License for more details. |
nkeynes@189 | 17 | */ |
nkeynes@189 | 18 | #include "pvr2.h" |
nkeynes@189 | 19 | #include "asic.h" |
nkeynes@189 | 20 | |
nkeynes@189 | 21 | #define STATE_IDLE 0 |
nkeynes@189 | 22 | #define STATE_IN_LIST 1 |
nkeynes@189 | 23 | #define STATE_EXPECT_POLY_BLOCK2 2 |
nkeynes@189 | 24 | #define STATE_EXPECT_VERTEX_BLOCK2 3 |
nkeynes@189 | 25 | #define STATE_ERROR 4 |
nkeynes@189 | 26 | #define STATE_EXPECT_END_VERTEX_BLOCK2 7 |
nkeynes@189 | 27 | |
nkeynes@189 | 28 | #define TA_CMD(i) ( (i) >> 29 ) |
nkeynes@189 | 29 | #define TA_CMD_END_LIST 0 |
nkeynes@189 | 30 | #define TA_CMD_CLIP 1 |
nkeynes@189 | 31 | #define TA_CMD_POLYGON_CONTEXT 4 |
nkeynes@189 | 32 | #define TA_CMD_SPRITE_CONTEXT 5 |
nkeynes@189 | 33 | #define TA_CMD_VERTEX 7 |
nkeynes@189 | 34 | |
nkeynes@189 | 35 | #define TA_LIST_NONE -1 |
nkeynes@189 | 36 | #define TA_LIST_OPAQUE 0 |
nkeynes@189 | 37 | #define TA_LIST_OPAQUE_MOD 1 |
nkeynes@189 | 38 | #define TA_LIST_TRANS 2 |
nkeynes@189 | 39 | #define TA_LIST_TRANS_MOD 3 |
nkeynes@189 | 40 | #define TA_LIST_PUNCH_OUT 4 |
nkeynes@189 | 41 | #define TA_IS_MODIFIER_LIST(list) (list == TA_LIST_OPAQUE_MOD || list == TA_LIST_TRANS_MOD) |
nkeynes@189 | 42 | |
nkeynes@189 | 43 | #define TA_GROW_UP 0 |
nkeynes@189 | 44 | #define TA_GROW_DOWN 1 |
nkeynes@189 | 45 | |
nkeynes@189 | 46 | #define TA_VERTEX_NONE -1 |
nkeynes@189 | 47 | #define TA_VERTEX_PACKED 0x00 |
nkeynes@189 | 48 | #define TA_VERTEX_TEX_PACKED 0x08 |
nkeynes@189 | 49 | #define TA_VERTEX_TEX_SPEC_PACKED 0x0C |
nkeynes@189 | 50 | #define TA_VERTEX_TEX_UV16_PACKED 0x09 |
nkeynes@189 | 51 | #define TA_VERTEX_TEX_UV16_SPEC_PACKED 0x0D |
nkeynes@189 | 52 | #define TA_VERTEX_FLOAT 0x10 |
nkeynes@189 | 53 | #define TA_VERTEX_TEX_FLOAT 0x18 |
nkeynes@189 | 54 | #define TA_VERTEX_TEX_SPEC_FLOAT 0x1C |
nkeynes@189 | 55 | #define TA_VERTEX_TEX_UV16_FLOAT 0x19 |
nkeynes@189 | 56 | #define TA_VERTEX_TEX_UV16_SPEC_FLOAT 0x1D |
nkeynes@189 | 57 | #define TA_VERTEX_INTENSITY 0x20 |
nkeynes@189 | 58 | #define TA_VERTEX_TEX_INTENSITY 0x28 |
nkeynes@189 | 59 | #define TA_VERTEX_TEX_SPEC_INTENSITY 0x2C |
nkeynes@189 | 60 | #define TA_VERTEX_TEX_UV16_INTENSITY 0x29 |
nkeynes@189 | 61 | #define TA_VERTEX_TEX_UV16_SPEC_INTENSITY 0x2D |
nkeynes@189 | 62 | #define TA_VERTEX_PACKED_MOD 0x40 |
nkeynes@189 | 63 | #define TA_VERTEX_TEX_PACKED_MOD 0x48 |
nkeynes@189 | 64 | #define TA_VERTEX_TEX_SPEC_PACKED_MOD 0x4C |
nkeynes@189 | 65 | #define TA_VERTEX_TEX_UV16_PACKED_MOD 0x49 |
nkeynes@189 | 66 | #define TA_VERTEX_TEX_UV16_SPEC_PACKED_MOD 0x4D |
nkeynes@189 | 67 | #define TA_VERTEX_INTENSITY_MOD 0x60 |
nkeynes@189 | 68 | #define TA_VERTEX_TEX_INTENSITY_MOD 0x68 |
nkeynes@189 | 69 | #define TA_VERTEX_TEX_SPEC_INTENSITY_MOD 0x6C |
nkeynes@189 | 70 | #define TA_VERTEX_TEX_UV16_INTENSITY_MOD 0x69 |
nkeynes@189 | 71 | #define TA_VERTEX_TEX_UV16_SPEC_INTENSITY_MOD 0x6D |
nkeynes@189 | 72 | #define TA_VERTEX_SPRITE 0x80 |
nkeynes@189 | 73 | #define TA_VERTEX_TEX_SPRITE 0x88 |
nkeynes@189 | 74 | #define TA_VERTEX_MOD_VOLUME 0x81 |
nkeynes@189 | 75 | |
nkeynes@189 | 76 | #define TA_IS_NORMAL_POLY() (ta_status.current_vertex_type < TA_VERTEX_SPRITE) |
nkeynes@189 | 77 | |
nkeynes@189 | 78 | static int strip_lengths[4] = {3,4,6,8}; /* in vertexes */ |
nkeynes@189 | 79 | #define TA_POLYCMD_LISTTYPE(i) ( ((i) >> 24) & 0x0F ) |
nkeynes@189 | 80 | #define TA_POLYCMD_LENGTH(i) strip_lengths[((i >> 18) & 0x03)] |
nkeynes@189 | 81 | #define TA_POLYCMD_CLIP(i) ((i>>16)&0x03) |
nkeynes@189 | 82 | #define TA_POLYCMD_COLOURFMT(i) (i & 0x00000030) |
nkeynes@189 | 83 | #define TA_POLYCMD_COLOURFMT_ARGB32 0x00000000 |
nkeynes@189 | 84 | #define TA_POLYCMD_COLOURFMT_FLOAT 0x00000010 |
nkeynes@189 | 85 | #define TA_POLYCMD_COLOURFMT_INTENSITY 0x00000020 |
nkeynes@189 | 86 | #define TA_POLYCMD_COLOURFMT_LASTINT 0x00000030 |
nkeynes@189 | 87 | |
nkeynes@189 | 88 | #define TA_POLYCMD_MODIFIED 0x00000080 |
nkeynes@189 | 89 | #define TA_POLYCMD_FULLMOD 0x00000040 |
nkeynes@189 | 90 | #define TA_POLYCMD_TEXTURED 0x00000008 |
nkeynes@189 | 91 | #define TA_POLYCMD_SPECULAR 0x00000004 |
nkeynes@189 | 92 | #define TA_POLYCMD_SHADED 0x00000002 |
nkeynes@189 | 93 | #define TA_POLYCMD_UV16 0x00000001 |
nkeynes@189 | 94 | |
nkeynes@189 | 95 | #define TA_POLYCMD_IS_SPECULAR(i) ((i & 0x0000000C)==0x0000000C) /* Only applies to textured polys */ |
nkeynes@189 | 96 | #define TA_POLYCMD_IS_FULLMOD(i) ((i & 0x000000C0)==0x000000C0) |
nkeynes@189 | 97 | |
nkeynes@189 | 98 | |
nkeynes@189 | 99 | #define TA_IS_END_VERTEX(i) (i & 0x10000000) |
nkeynes@189 | 100 | |
nkeynes@189 | 101 | #define MIN3( x1, x2, x3 ) ( (x1)<(x2)? ((x1)<(x3)?(x1):(x3)) : ((x2)<(x3)?(x2):(x3)) ) |
nkeynes@189 | 102 | #define MAX3( x1, x2, x3 ) ( (x1)>(x2)? ((x1)>(x3)?(x1):(x3)) : ((x2)>(x3)?(x2):(x3)) ) |
nkeynes@189 | 103 | |
nkeynes@189 | 104 | #define TILESLOT( x, y ) (ta_status.current_tile_matrix + (ta_status.current_tile_size * (y * ta_status.width+ x) << 2)) |
nkeynes@189 | 105 | |
nkeynes@189 | 106 | extern char *video_base; |
nkeynes@189 | 107 | #define PVRRAM(addr) (*(uint32_t *)(video_base + ((addr)&PVR2_RAM_MASK))) |
nkeynes@189 | 108 | |
nkeynes@189 | 109 | struct pvr2_ta_vertex { |
nkeynes@189 | 110 | float x,y,z; |
nkeynes@189 | 111 | uint32_t detail[8]; /* 0-8 detail words */ |
nkeynes@189 | 112 | }; |
nkeynes@189 | 113 | |
nkeynes@189 | 114 | struct tile_bounds { |
nkeynes@189 | 115 | int x1, y1, x2, y2; |
nkeynes@189 | 116 | }; |
nkeynes@189 | 117 | |
nkeynes@189 | 118 | struct pvr2_ta_status { |
nkeynes@189 | 119 | int state; |
nkeynes@189 | 120 | int width, height; /* Tile resolution, ie 20x15 */ |
nkeynes@189 | 121 | int tilelist_dir; /* Growth direction of the tilelist, 0 = up, 1 = down */ |
nkeynes@189 | 122 | uint32_t tilelist_size; /* Size of the tilelist segments */ |
nkeynes@189 | 123 | int current_vertex_type; |
nkeynes@189 | 124 | int vertex_count; /* index of last start-vertex seen, or -1 if no vertexes |
nkeynes@189 | 125 | * are present |
nkeynes@189 | 126 | */ |
nkeynes@189 | 127 | int max_vertex; /* Maximum number of vertexes in the current polygon (3/4/6/8) */ |
nkeynes@189 | 128 | int current_list_type; |
nkeynes@189 | 129 | uint32_t current_tile_matrix; /* Memory location of the first tile for the current list. */ |
nkeynes@189 | 130 | uint32_t current_tile_size; /* Size of the tile matrix space in 32-bit words (0/8/16/32)*/ |
nkeynes@189 | 131 | uint32_t intensity1, intensity2; |
nkeynes@189 | 132 | /** |
nkeynes@189 | 133 | * Current working object |
nkeynes@189 | 134 | */ |
nkeynes@189 | 135 | int poly_context_size; |
nkeynes@189 | 136 | int poly_vertex_size; |
nkeynes@189 | 137 | int poly_parity; |
nkeynes@189 | 138 | uint32_t poly_context[5]; |
nkeynes@189 | 139 | uint32_t poly_pointer; |
nkeynes@189 | 140 | struct tile_bounds last_triangle_bounds; |
nkeynes@189 | 141 | struct pvr2_ta_vertex poly_vertex[8]; |
nkeynes@189 | 142 | int debug_output; |
nkeynes@189 | 143 | }; |
nkeynes@189 | 144 | |
nkeynes@189 | 145 | static struct pvr2_ta_status ta_status; |
nkeynes@189 | 146 | |
nkeynes@189 | 147 | static int tilematrix_sizes[4] = {0,8,16,32}; |
nkeynes@189 | 148 | |
nkeynes@189 | 149 | /** |
nkeynes@189 | 150 | * Convenience union - ta data is either 32-bit integer or 32-bit float. |
nkeynes@189 | 151 | */ |
nkeynes@189 | 152 | union ta_data { |
nkeynes@189 | 153 | unsigned int i; |
nkeynes@189 | 154 | float f; |
nkeynes@189 | 155 | }; |
nkeynes@189 | 156 | |
nkeynes@189 | 157 | |
nkeynes@189 | 158 | void pvr2_ta_reset() { |
nkeynes@189 | 159 | ta_status.state = STATE_ERROR; /* State not valid until initialized */ |
nkeynes@189 | 160 | ta_status.debug_output = 0; |
nkeynes@189 | 161 | } |
nkeynes@189 | 162 | |
nkeynes@189 | 163 | void pvr2_ta_init() { |
nkeynes@189 | 164 | ta_status.state = STATE_IDLE; |
nkeynes@189 | 165 | ta_status.current_list_type = -1; |
nkeynes@189 | 166 | ta_status.current_vertex_type = -1; |
nkeynes@189 | 167 | ta_status.poly_parity = 0; |
nkeynes@189 | 168 | ta_status.vertex_count = 0; |
nkeynes@189 | 169 | ta_status.max_vertex = 3; |
nkeynes@189 | 170 | ta_status.last_triangle_bounds.x1 = -1; |
nkeynes@189 | 171 | |
nkeynes@189 | 172 | uint32_t size = MMIO_READ( PVR2, TA_TILESIZE ); |
nkeynes@189 | 173 | ta_status.width = (size & 0xFFFF) + 1; |
nkeynes@189 | 174 | ta_status.height = (size >> 16) + 1; |
nkeynes@189 | 175 | uint32_t control = MMIO_READ( PVR2, TA_TILECFG ); |
nkeynes@189 | 176 | ta_status.tilelist_dir = (control >> 20) & 0x01; |
nkeynes@189 | 177 | ta_status.tilelist_size = tilematrix_sizes[ (control & 0x03) ]; |
nkeynes@189 | 178 | MMIO_WRITE( PVR2, TA_POLYPOS, MMIO_READ( PVR2, TA_POLYBASE ) ); |
nkeynes@189 | 179 | uint32_t plistpos = MMIO_READ( PVR2, TA_LISTBASE ) >> 2; |
nkeynes@189 | 180 | if( ta_status.tilelist_dir == TA_GROW_DOWN ) { |
nkeynes@189 | 181 | plistpos -= ta_status.tilelist_size; |
nkeynes@189 | 182 | } |
nkeynes@189 | 183 | MMIO_WRITE( PVR2, TA_LISTPOS, plistpos ); |
nkeynes@189 | 184 | } |
nkeynes@189 | 185 | |
nkeynes@189 | 186 | static uint32_t parse_float_colour( float a, float r, float g, float b ) { |
nkeynes@189 | 187 | return |
nkeynes@189 | 188 | (((unsigned int)((256 * CLAMP(a,0.0,1.0))-1))<<24) | |
nkeynes@189 | 189 | (((unsigned int)((256 * CLAMP(r,0.0,1.0))-1))<<16) | |
nkeynes@189 | 190 | (((unsigned int)((256 * CLAMP(g,0.0,1.0))-1))<<8) | |
nkeynes@189 | 191 | (((unsigned int)((256 * CLAMP(b,0.0,1.0))-1))); |
nkeynes@189 | 192 | } |
nkeynes@189 | 193 | |
nkeynes@189 | 194 | static uint32_t parse_intensity_colour( uint32_t base, float intensity ) |
nkeynes@189 | 195 | { |
nkeynes@189 | 196 | unsigned int i = (unsigned int)(256 * CLAMP(intensity, 0.0,1.0)); |
nkeynes@189 | 197 | |
nkeynes@189 | 198 | return |
nkeynes@189 | 199 | (((((base & 0xFF) * i) & 0xFF00) | |
nkeynes@189 | 200 | (((base & 0xFF00) * i) & 0xFF0000) | |
nkeynes@189 | 201 | (((base & 0xFF0000) * i) & 0xFF000000)) >> 8) | |
nkeynes@189 | 202 | base & 0xFF000000; |
nkeynes@189 | 203 | } |
nkeynes@189 | 204 | |
nkeynes@189 | 205 | /** |
nkeynes@189 | 206 | * Initialize the specified TA list. |
nkeynes@189 | 207 | */ |
nkeynes@189 | 208 | static void ta_init_list( unsigned int listtype ) { |
nkeynes@189 | 209 | int config = MMIO_READ( PVR2, TA_TILECFG ); |
nkeynes@189 | 210 | int tile_matrix = MMIO_READ( PVR2, TA_TILEBASE ); |
nkeynes@189 | 211 | if( listtype <= TA_LIST_PUNCH_OUT ) { |
nkeynes@189 | 212 | int i; |
nkeynes@189 | 213 | uint32_t *p; |
nkeynes@189 | 214 | for( i=0; i < listtype; i++ ) { |
nkeynes@189 | 215 | int size = tilematrix_sizes[(config & 0x03)] << 2; |
nkeynes@189 | 216 | tile_matrix += ta_status.width * ta_status.height * size; |
nkeynes@189 | 217 | config >>= 4; |
nkeynes@189 | 218 | } |
nkeynes@189 | 219 | ta_status.current_tile_matrix = tile_matrix; |
nkeynes@189 | 220 | ta_status.current_tile_size = tilematrix_sizes[(config & 0x03)]; |
nkeynes@189 | 221 | |
nkeynes@189 | 222 | /* Initialize each tile to 0xF0000000 */ |
nkeynes@189 | 223 | if( ta_status.current_tile_size != 0 ) { |
nkeynes@189 | 224 | p = (uint32_t *)(video_base + tile_matrix); |
nkeynes@189 | 225 | for( i=0; i< ta_status.width * ta_status.height; i++ ) { |
nkeynes@189 | 226 | *p = 0xF0000000; |
nkeynes@189 | 227 | p += ta_status.current_tile_size; |
nkeynes@189 | 228 | } |
nkeynes@189 | 229 | } |
nkeynes@189 | 230 | } |
nkeynes@189 | 231 | ta_status.state = STATE_IN_LIST; |
nkeynes@189 | 232 | ta_status.current_list_type = listtype; |
nkeynes@189 | 233 | ta_status.last_triangle_bounds.x1 = -1; |
nkeynes@189 | 234 | } |
nkeynes@189 | 235 | |
nkeynes@189 | 236 | static int list_events[5] = {EVENT_PVR_OPAQUE_DONE, EVENT_PVR_OPAQUEMOD_DONE, |
nkeynes@189 | 237 | EVENT_PVR_TRANS_DONE, EVENT_PVR_TRANSMOD_DONE, |
nkeynes@189 | 238 | EVENT_PVR_PUNCHOUT_DONE }; |
nkeynes@189 | 239 | |
nkeynes@189 | 240 | static void ta_end_list() { |
nkeynes@189 | 241 | if( ta_status.current_list_type != TA_LIST_NONE ) { |
nkeynes@189 | 242 | asic_event( list_events[ta_status.current_list_type] ); |
nkeynes@189 | 243 | ta_status.current_list_type = TA_LIST_NONE; |
nkeynes@189 | 244 | ta_status.current_vertex_type = -1; |
nkeynes@189 | 245 | ta_status.state = STATE_IDLE; |
nkeynes@189 | 246 | } |
nkeynes@189 | 247 | } |
nkeynes@189 | 248 | |
nkeynes@189 | 249 | /** |
nkeynes@189 | 250 | * Write data out to the polygon buffer. |
nkeynes@189 | 251 | * If the end-of-buffer is reached, asserts EVENT_PVR_PRIM_ALLOC_FAIL |
nkeynes@189 | 252 | * @param data to be written |
nkeynes@189 | 253 | * @param length Number of 32-bit words to write. |
nkeynes@189 | 254 | * @return number of words actually written |
nkeynes@189 | 255 | */ |
nkeynes@189 | 256 | static int ta_write_polygon_buffer( uint32_t *data, int length ) |
nkeynes@189 | 257 | { |
nkeynes@189 | 258 | int rv; |
nkeynes@189 | 259 | int posn = MMIO_READ( PVR2, TA_POLYPOS ); |
nkeynes@189 | 260 | int end = MMIO_READ( PVR2, TA_POLYEND ); |
nkeynes@189 | 261 | uint32_t *target = (uint32_t *)(video_base + posn); |
nkeynes@189 | 262 | for( rv=0; rv < length; rv++ ) { |
nkeynes@189 | 263 | if( posn == end ) { |
nkeynes@189 | 264 | asic_event( EVENT_PVR_PRIM_ALLOC_FAIL ); |
nkeynes@189 | 265 | asic_event( EVENT_TA_ERROR ); |
nkeynes@189 | 266 | // ta_status.state = STATE_ERROR; |
nkeynes@189 | 267 | break; |
nkeynes@189 | 268 | } |
nkeynes@189 | 269 | *target++ = *data++; |
nkeynes@189 | 270 | posn += 4; |
nkeynes@189 | 271 | } |
nkeynes@189 | 272 | |
nkeynes@189 | 273 | MMIO_WRITE( PVR2, TA_POLYPOS, posn ); |
nkeynes@189 | 274 | return rv; |
nkeynes@189 | 275 | } |
nkeynes@189 | 276 | |
nkeynes@189 | 277 | /** |
nkeynes@189 | 278 | * Allocate a new tile list from the grow space |
nkeynes@189 | 279 | */ |
nkeynes@189 | 280 | static uint32_t ta_alloc_tilelist() { |
nkeynes@189 | 281 | uint32_t posn = MMIO_READ( PVR2, TA_LISTPOS ); |
nkeynes@189 | 282 | uint32_t newposn; |
nkeynes@189 | 283 | if( ta_status.tilelist_dir == TA_GROW_DOWN ) { |
nkeynes@189 | 284 | newposn = posn - ta_status.tilelist_size; |
nkeynes@189 | 285 | } else { |
nkeynes@189 | 286 | newposn = posn + ta_status.tilelist_size; |
nkeynes@189 | 287 | } |
nkeynes@189 | 288 | MMIO_WRITE( PVR2, TA_LISTPOS, newposn ); |
nkeynes@189 | 289 | return posn << 2; |
nkeynes@189 | 290 | } |
nkeynes@189 | 291 | |
nkeynes@189 | 292 | /** |
nkeynes@189 | 293 | * Write a tile entry out to the matrix. |
nkeynes@189 | 294 | */ |
nkeynes@189 | 295 | static int ta_write_tile_entry( int x, int y, uint32_t tile_entry ) { |
nkeynes@189 | 296 | uint32_t tile = TILESLOT(x,y); |
nkeynes@189 | 297 | uint32_t value; |
nkeynes@189 | 298 | uint32_t lasttri = 0; |
nkeynes@189 | 299 | int i,l; |
nkeynes@189 | 300 | |
nkeynes@189 | 301 | if( (tile_entry & 0x80000000) && |
nkeynes@189 | 302 | ta_status.last_triangle_bounds.x1 != -1 && |
nkeynes@189 | 303 | ta_status.last_triangle_bounds.x1 <= x && |
nkeynes@189 | 304 | ta_status.last_triangle_bounds.x2 >= x && |
nkeynes@189 | 305 | ta_status.last_triangle_bounds.y1 <= y && |
nkeynes@189 | 306 | ta_status.last_triangle_bounds.y2 >= y ) { |
nkeynes@189 | 307 | /* potential for triangle stacking */ |
nkeynes@189 | 308 | lasttri = tile_entry & 0xE1E00000; |
nkeynes@189 | 309 | } |
nkeynes@189 | 310 | |
nkeynes@189 | 311 | |
nkeynes@189 | 312 | if( PVRRAM(tile) == 0xF0000000 ) { |
nkeynes@189 | 313 | PVRRAM(tile) = tile_entry; |
nkeynes@189 | 314 | PVRRAM(tile+4) = 0xF0000000; |
nkeynes@189 | 315 | return; |
nkeynes@189 | 316 | } |
nkeynes@189 | 317 | |
nkeynes@189 | 318 | while(1) { |
nkeynes@189 | 319 | value = PVRRAM(tile); |
nkeynes@189 | 320 | for( i=1; i<ta_status.current_tile_size; i++ ) { |
nkeynes@189 | 321 | tile += 4; |
nkeynes@189 | 322 | uint32_t nextval = PVRRAM(tile); |
nkeynes@189 | 323 | if( nextval == 0xF0000000 ) { |
nkeynes@189 | 324 | if( lasttri != 0 && lasttri == (value&0xE1E00000) ) { |
nkeynes@189 | 325 | int count = (value & 0x1E000000) + 0x02000000; |
nkeynes@189 | 326 | if( count < 0x20000000 ) { |
nkeynes@189 | 327 | PVRRAM(tile-4) = (value & 0xE1FFFFFF) | count; |
nkeynes@189 | 328 | return; |
nkeynes@189 | 329 | } |
nkeynes@189 | 330 | } |
nkeynes@189 | 331 | if( i < ta_status.current_tile_size-1 ) { |
nkeynes@189 | 332 | PVRRAM(tile) = tile_entry; |
nkeynes@189 | 333 | PVRRAM(tile+4) = 0xF0000000; |
nkeynes@189 | 334 | return; |
nkeynes@189 | 335 | } |
nkeynes@189 | 336 | } |
nkeynes@189 | 337 | value = nextval; |
nkeynes@189 | 338 | } |
nkeynes@189 | 339 | |
nkeynes@189 | 340 | if( value == 0xF0000000 ) { |
nkeynes@189 | 341 | value = ta_alloc_tilelist(); |
nkeynes@189 | 342 | PVRRAM(tile) = value | 0xE0000000; |
nkeynes@189 | 343 | tile = value; |
nkeynes@189 | 344 | PVRRAM(tile) = tile_entry; |
nkeynes@189 | 345 | PVRRAM(tile+4) = 0xF0000000; |
nkeynes@189 | 346 | return; |
nkeynes@189 | 347 | } else if( (value & 0xFF000000) == 0xE0000000 ) { |
nkeynes@189 | 348 | tile = (value & 0x00FFFFFF); |
nkeynes@189 | 349 | } else { |
nkeynes@189 | 350 | /* This should never happen */ |
nkeynes@189 | 351 | return 0; |
nkeynes@189 | 352 | } |
nkeynes@189 | 353 | } |
nkeynes@189 | 354 | } |
nkeynes@189 | 355 | |
nkeynes@189 | 356 | /** |
nkeynes@189 | 357 | * Write a completed polygon out to the memory buffers |
nkeynes@189 | 358 | * OPTIMIZEME: This is not terribly efficient at the moment. |
nkeynes@189 | 359 | */ |
nkeynes@189 | 360 | static void ta_commit_polygon( ) { |
nkeynes@189 | 361 | int i, x, y; |
nkeynes@189 | 362 | int tx[ta_status.vertex_count], ty[ta_status.vertex_count]; |
nkeynes@189 | 363 | struct tile_bounds triangle_bound[ta_status.vertex_count - 2]; |
nkeynes@189 | 364 | struct tile_bounds polygon_bound; |
nkeynes@189 | 365 | uint32_t poly_context[5]; |
nkeynes@189 | 366 | |
nkeynes@189 | 367 | if( ta_status.vertex_count < 2 ) { |
nkeynes@189 | 368 | return; /* No polygons - ignore */ |
nkeynes@189 | 369 | } |
nkeynes@189 | 370 | memcpy( poly_context, ta_status.poly_context, ta_status.poly_context_size * 4 ); |
nkeynes@189 | 371 | |
nkeynes@189 | 372 | /* Compute the tile coordinates for each vertex (need to be careful with |
nkeynes@189 | 373 | * clamping here) |
nkeynes@189 | 374 | */ |
nkeynes@189 | 375 | for( i=0; i<ta_status.vertex_count; i++ ) { |
nkeynes@189 | 376 | if( ta_status.poly_vertex[i].x < 0.0 ) { |
nkeynes@189 | 377 | tx[i] = -1; |
nkeynes@189 | 378 | } else if( ta_status.poly_vertex[i].x > (float)INT_MAX ) { |
nkeynes@189 | 379 | tx[i] = INT_MAX/32; |
nkeynes@189 | 380 | } else { |
nkeynes@189 | 381 | tx[i] = (int)(ta_status.poly_vertex[i].x / 32.0); |
nkeynes@189 | 382 | } |
nkeynes@189 | 383 | if( ta_status.poly_vertex[i].y < 0.0 ) { |
nkeynes@189 | 384 | ty[i] = -1; |
nkeynes@189 | 385 | } else if( ta_status.poly_vertex[i].y > (float)INT_MAX ) { |
nkeynes@189 | 386 | ty[i] = INT_MAX/32; |
nkeynes@189 | 387 | } else { |
nkeynes@189 | 388 | ty[i] = (int)(ta_status.poly_vertex[i].y / 32.0); |
nkeynes@189 | 389 | } |
nkeynes@189 | 390 | |
nkeynes@189 | 391 | } |
nkeynes@189 | 392 | |
nkeynes@189 | 393 | /* Compute bounding box for each triangle individually, as well |
nkeynes@189 | 394 | * as the overall polygon. |
nkeynes@189 | 395 | */ |
nkeynes@189 | 396 | |
nkeynes@189 | 397 | for( i=0; i<ta_status.vertex_count-2; i++ ) { |
nkeynes@189 | 398 | triangle_bound[i].x1 = MIN3(tx[i],tx[i+1],tx[i+2]); |
nkeynes@189 | 399 | triangle_bound[i].x2 = MAX3(tx[i],tx[i+1],tx[i+2]); |
nkeynes@189 | 400 | triangle_bound[i].y1 = MIN3(ty[i],ty[i+1],ty[i+2]); |
nkeynes@189 | 401 | triangle_bound[i].y2 = MAX3(ty[i],ty[i+1],ty[i+2]); |
nkeynes@189 | 402 | if( i == 0 ) { |
nkeynes@189 | 403 | polygon_bound.x1 = triangle_bound[0].x1; |
nkeynes@189 | 404 | polygon_bound.y1 = triangle_bound[0].y1; |
nkeynes@189 | 405 | polygon_bound.x2 = triangle_bound[0].x2; |
nkeynes@189 | 406 | polygon_bound.y2 = triangle_bound[0].y2; |
nkeynes@189 | 407 | } else { |
nkeynes@189 | 408 | polygon_bound.x1 = MIN(polygon_bound.x1, triangle_bound[i].x1); |
nkeynes@189 | 409 | polygon_bound.x2 = MAX(polygon_bound.x2, triangle_bound[i].x2); |
nkeynes@189 | 410 | polygon_bound.y1 = MIN(polygon_bound.y1, triangle_bound[i].y1); |
nkeynes@189 | 411 | polygon_bound.y2 = MAX(polygon_bound.y2, triangle_bound[i].y2); |
nkeynes@189 | 412 | } |
nkeynes@189 | 413 | } |
nkeynes@189 | 414 | |
nkeynes@189 | 415 | /* If the polygon is actually entirely out of the frustum, clip it entirely */ |
nkeynes@189 | 416 | if( polygon_bound.x2 < 0 || polygon_bound.x1 > ta_status.width || |
nkeynes@189 | 417 | polygon_bound.y2 < 0 || polygon_bound.y1 > ta_status.height ) { |
nkeynes@189 | 418 | return; |
nkeynes@189 | 419 | } |
nkeynes@189 | 420 | |
nkeynes@189 | 421 | /* Clamp the polygon bounds to the frustum */ |
nkeynes@189 | 422 | if( polygon_bound.x1 < 0 ) polygon_bound.x1 = 0; |
nkeynes@189 | 423 | if( polygon_bound.x2 >= ta_status.width ) polygon_bound.x2 = ta_status.width-1; |
nkeynes@189 | 424 | if( polygon_bound.y1 < 0 ) polygon_bound.y1 = 0; |
nkeynes@189 | 425 | if( polygon_bound.y2 >= ta_status.width ) polygon_bound.y2 = ta_status.height-1; |
nkeynes@189 | 426 | |
nkeynes@189 | 427 | /* Set the "single tile" flag if it's entirely contained in 1 tile */ |
nkeynes@189 | 428 | if( polygon_bound.x1 == polygon_bound.x2 && |
nkeynes@189 | 429 | polygon_bound.y1 == polygon_bound.y2 ) { |
nkeynes@189 | 430 | poly_context[0] |= 0x00200000; |
nkeynes@189 | 431 | } |
nkeynes@189 | 432 | |
nkeynes@189 | 433 | /* Ok, we're good to go - write out the polygon first */ |
nkeynes@189 | 434 | uint32_t tile_entry = MMIO_READ( PVR2, TA_POLYPOS ) >> 2 | ta_status.poly_pointer; |
nkeynes@189 | 435 | |
nkeynes@189 | 436 | int status = ta_write_polygon_buffer( poly_context, ta_status.poly_context_size ); |
nkeynes@189 | 437 | if( status == 0 ) { |
nkeynes@189 | 438 | /* No memory available - abort */ |
nkeynes@189 | 439 | return; |
nkeynes@189 | 440 | } else { |
nkeynes@189 | 441 | for( i=0; i<ta_status.vertex_count && status != 0; i++ ) { |
nkeynes@189 | 442 | status = ta_write_polygon_buffer( (uint32_t *)(&ta_status.poly_vertex[i]), 3 + ta_status.poly_vertex_size ); |
nkeynes@189 | 443 | } |
nkeynes@189 | 444 | } |
nkeynes@189 | 445 | |
nkeynes@189 | 446 | /* And now the tile entries. Triangles are different from everything else */ |
nkeynes@189 | 447 | if( ta_status.vertex_count == 3 ) { |
nkeynes@189 | 448 | tile_entry |= 0x80000000; |
nkeynes@189 | 449 | for( y=polygon_bound.y1; y<=polygon_bound.y2; y++ ) { |
nkeynes@189 | 450 | for( x=polygon_bound.x1; x<=polygon_bound.x2; x++ ) { |
nkeynes@189 | 451 | ta_write_tile_entry( x,y,tile_entry ); |
nkeynes@189 | 452 | } |
nkeynes@189 | 453 | } |
nkeynes@189 | 454 | ta_status.last_triangle_bounds.x1 = polygon_bound.x1; |
nkeynes@189 | 455 | ta_status.last_triangle_bounds.y1 = polygon_bound.y1; |
nkeynes@189 | 456 | ta_status.last_triangle_bounds.x2 = polygon_bound.x2; |
nkeynes@189 | 457 | ta_status.last_triangle_bounds.y2 = polygon_bound.y2; |
nkeynes@189 | 458 | } else if( ta_status.current_vertex_type == TA_VERTEX_SPRITE || |
nkeynes@189 | 459 | ta_status.current_vertex_type == TA_VERTEX_TEX_SPRITE ) { |
nkeynes@189 | 460 | tile_entry |= 0xA0000000; |
nkeynes@189 | 461 | for( y=polygon_bound.y1; y<=polygon_bound.y2; y++ ) { |
nkeynes@189 | 462 | for( x=polygon_bound.x1; x<=polygon_bound.x2; x++ ) { |
nkeynes@189 | 463 | ta_write_tile_entry( x,y,tile_entry ); |
nkeynes@189 | 464 | } |
nkeynes@189 | 465 | } |
nkeynes@189 | 466 | ta_status.last_triangle_bounds.x1 = polygon_bound.x1; |
nkeynes@189 | 467 | ta_status.last_triangle_bounds.y1 = polygon_bound.y1; |
nkeynes@189 | 468 | ta_status.last_triangle_bounds.x2 = polygon_bound.x2; |
nkeynes@189 | 469 | ta_status.last_triangle_bounds.y2 = polygon_bound.y2; |
nkeynes@189 | 470 | } else { |
nkeynes@189 | 471 | for( y=polygon_bound.y1; y<=polygon_bound.y2; y++ ) { |
nkeynes@189 | 472 | for( x=polygon_bound.x1; x<=polygon_bound.x2; x++ ) { |
nkeynes@189 | 473 | uint32_t entry = tile_entry; |
nkeynes@189 | 474 | for( i=0; i<ta_status.vertex_count-2; i++ ) { |
nkeynes@189 | 475 | if( triangle_bound[i].x1 <= x && triangle_bound[i].x2 >= x && |
nkeynes@189 | 476 | triangle_bound[i].y1 <= y && triangle_bound[i].y2 >= y ) { |
nkeynes@189 | 477 | entry |= (0x40000000>>i); |
nkeynes@189 | 478 | } |
nkeynes@189 | 479 | } |
nkeynes@189 | 480 | ta_write_tile_entry( x, y, entry ); |
nkeynes@189 | 481 | } |
nkeynes@189 | 482 | } |
nkeynes@189 | 483 | ta_status.last_triangle_bounds.x1 = -1; |
nkeynes@189 | 484 | } |
nkeynes@189 | 485 | } |
nkeynes@189 | 486 | |
nkeynes@189 | 487 | /** |
nkeynes@189 | 488 | * Variant of ta_split_polygon called when vertex_count == max_vertex, but |
nkeynes@189 | 489 | * the client hasn't sent the LAST VERTEX flag. Commit the poly as normal |
nkeynes@189 | 490 | * first, then start a new poly with the first 2 vertexes taken from the |
nkeynes@189 | 491 | * current one. |
nkeynes@189 | 492 | */ |
nkeynes@189 | 493 | static void ta_split_polygon() { |
nkeynes@189 | 494 | ta_commit_polygon(); |
nkeynes@189 | 495 | if( TA_IS_NORMAL_POLY() ) { |
nkeynes@189 | 496 | /* This only applies to ordinary polys - Sprites + modifier lists are |
nkeynes@189 | 497 | * handled differently |
nkeynes@189 | 498 | */ |
nkeynes@189 | 499 | if( ta_status.vertex_count == 3 ) { |
nkeynes@189 | 500 | /* Triangles use an odd/even scheme */ |
nkeynes@189 | 501 | if( ta_status.poly_parity == 0 ) { |
nkeynes@189 | 502 | memcpy( &ta_status.poly_vertex[0], &ta_status.poly_vertex[2], |
nkeynes@189 | 503 | sizeof(struct pvr2_ta_vertex) ); |
nkeynes@189 | 504 | ta_status.poly_parity = 1; |
nkeynes@189 | 505 | } else { |
nkeynes@189 | 506 | memcpy( &ta_status.poly_vertex[1], &ta_status.poly_vertex[2], |
nkeynes@189 | 507 | sizeof(struct pvr2_ta_vertex) ); |
nkeynes@189 | 508 | ta_status.poly_parity = 0; |
nkeynes@189 | 509 | } |
nkeynes@189 | 510 | } else { |
nkeynes@189 | 511 | /* Everything else just uses the last 2 vertexes in order */ |
nkeynes@189 | 512 | memcpy( &ta_status.poly_vertex[0], &ta_status.poly_vertex[ta_status.vertex_count-2], |
nkeynes@189 | 513 | sizeof(struct pvr2_ta_vertex)*2 ); |
nkeynes@189 | 514 | ta_status.poly_parity = 0; |
nkeynes@189 | 515 | } |
nkeynes@189 | 516 | ta_status.vertex_count = 2; |
nkeynes@189 | 517 | } else { |
nkeynes@189 | 518 | ta_status.vertex_count = 0; |
nkeynes@189 | 519 | } |
nkeynes@189 | 520 | } |
nkeynes@189 | 521 | |
nkeynes@189 | 522 | /** |
nkeynes@189 | 523 | * Parse the polygon context block and setup the internal state to receive |
nkeynes@189 | 524 | * vertexes. |
nkeynes@189 | 525 | * @param data 32 bytes of parameter data. |
nkeynes@189 | 526 | */ |
nkeynes@189 | 527 | static void ta_parse_polygon_context( union ta_data *data ) { |
nkeynes@189 | 528 | int colourfmt = TA_POLYCMD_COLOURFMT(data[0].i); |
nkeynes@189 | 529 | ta_status.max_vertex = TA_POLYCMD_LENGTH(data[0].i); |
nkeynes@189 | 530 | ta_status.vertex_count = 0; |
nkeynes@189 | 531 | ta_status.poly_context[0] = |
nkeynes@189 | 532 | (data[1].i & 0xFC1FFFFF) | ((data[0].i & 0x0B) << 22); |
nkeynes@189 | 533 | ta_status.poly_context[1] = data[2].i; |
nkeynes@189 | 534 | ta_status.poly_context[3] = data[4].i; |
nkeynes@189 | 535 | ta_status.poly_parity = 0; |
nkeynes@189 | 536 | if( data[0].i & TA_POLYCMD_TEXTURED ) { |
nkeynes@189 | 537 | ta_status.current_vertex_type = data[0].i & 0x0D; |
nkeynes@189 | 538 | ta_status.poly_context[2] = data[3].i; |
nkeynes@189 | 539 | ta_status.poly_context[4] = data[5].i; |
nkeynes@189 | 540 | if( data[0].i & TA_POLYCMD_SPECULAR ) { |
nkeynes@189 | 541 | ta_status.poly_context[0] |= 0x01000000; |
nkeynes@189 | 542 | ta_status.poly_vertex_size = 4; |
nkeynes@189 | 543 | } else { |
nkeynes@189 | 544 | ta_status.poly_vertex_size = 3; |
nkeynes@189 | 545 | } |
nkeynes@189 | 546 | if( data[0].i & TA_POLYCMD_UV16 ) { |
nkeynes@189 | 547 | ta_status.poly_vertex_size--; |
nkeynes@189 | 548 | } |
nkeynes@189 | 549 | } else { |
nkeynes@189 | 550 | ta_status.current_vertex_type = 0; |
nkeynes@189 | 551 | ta_status.poly_vertex_size = 1; |
nkeynes@189 | 552 | ta_status.poly_context[2] = 0; |
nkeynes@189 | 553 | ta_status.poly_context[4] = 0; |
nkeynes@189 | 554 | } |
nkeynes@189 | 555 | |
nkeynes@189 | 556 | ta_status.poly_pointer = (ta_status.poly_vertex_size << 21); |
nkeynes@189 | 557 | ta_status.poly_context_size = 3; |
nkeynes@189 | 558 | if( data[0].i & TA_POLYCMD_MODIFIED ) { |
nkeynes@189 | 559 | ta_status.poly_pointer |= 0x01000000; |
nkeynes@189 | 560 | if( data[0].i & TA_POLYCMD_FULLMOD ) { |
nkeynes@189 | 561 | ta_status.poly_context_size = 5; |
nkeynes@189 | 562 | ta_status.poly_vertex_size <<= 1; |
nkeynes@189 | 563 | ta_status.current_vertex_type |= 0x40; |
nkeynes@189 | 564 | /* Modified/float not supported - behaves as per last intensity */ |
nkeynes@189 | 565 | if( colourfmt == TA_POLYCMD_COLOURFMT_FLOAT ) { |
nkeynes@189 | 566 | colourfmt = TA_POLYCMD_COLOURFMT_LASTINT; |
nkeynes@189 | 567 | } |
nkeynes@189 | 568 | } |
nkeynes@189 | 569 | } |
nkeynes@189 | 570 | |
nkeynes@189 | 571 | if( colourfmt == TA_POLYCMD_COLOURFMT_INTENSITY ) { |
nkeynes@189 | 572 | if( TA_POLYCMD_IS_FULLMOD(data[0].i) || |
nkeynes@189 | 573 | TA_POLYCMD_IS_SPECULAR(data[0].i) ) { |
nkeynes@189 | 574 | ta_status.state = STATE_EXPECT_POLY_BLOCK2; |
nkeynes@189 | 575 | } else { |
nkeynes@189 | 576 | ta_status.intensity1 = |
nkeynes@189 | 577 | parse_float_colour( data[4].f, data[5].f, data[6].f, data[7].f ); |
nkeynes@189 | 578 | } |
nkeynes@189 | 579 | } else if( colourfmt == TA_POLYCMD_COLOURFMT_LASTINT ) { |
nkeynes@189 | 580 | colourfmt = TA_POLYCMD_COLOURFMT_INTENSITY; |
nkeynes@189 | 581 | } |
nkeynes@189 | 582 | |
nkeynes@189 | 583 | ta_status.current_vertex_type |= colourfmt; |
nkeynes@189 | 584 | } |
nkeynes@189 | 585 | |
nkeynes@189 | 586 | /** |
nkeynes@189 | 587 | * Parse the modifier volume context block and setup the internal state to |
nkeynes@189 | 588 | * receive modifier vertexes. |
nkeynes@189 | 589 | * @param data 32 bytes of parameter data. |
nkeynes@189 | 590 | */ |
nkeynes@189 | 591 | static void ta_parse_modifier_context( union ta_data *data ) { |
nkeynes@189 | 592 | ta_status.current_vertex_type = TA_VERTEX_MOD_VOLUME; |
nkeynes@189 | 593 | ta_status.poly_vertex_size = 0; |
nkeynes@189 | 594 | ta_status.poly_context_size = 3; |
nkeynes@189 | 595 | ta_status.poly_context[0] = (data[1].i & 0xFC1FFFFF) | |
nkeynes@189 | 596 | ((data[0].i & 0x0B)<<22); |
nkeynes@189 | 597 | if( TA_POLYCMD_IS_SPECULAR(data[0].i) ) { |
nkeynes@189 | 598 | ta_status.poly_context[0] |= 0x01000000; |
nkeynes@189 | 599 | } |
nkeynes@189 | 600 | ta_status.poly_context[1] = 0; |
nkeynes@189 | 601 | ta_status.poly_context[2] = 0; |
nkeynes@189 | 602 | ta_status.vertex_count = 0; |
nkeynes@189 | 603 | ta_status.max_vertex = 3; |
nkeynes@189 | 604 | ta_status.poly_pointer = 0; |
nkeynes@189 | 605 | } |
nkeynes@189 | 606 | |
nkeynes@189 | 607 | /** |
nkeynes@189 | 608 | * Parse the sprite context block and setup the internal state to receive |
nkeynes@189 | 609 | * vertexes. |
nkeynes@189 | 610 | * @param data 32 bytes of parameter data. |
nkeynes@189 | 611 | */ |
nkeynes@189 | 612 | static void ta_parse_sprite_context( union ta_data *data ) { |
nkeynes@189 | 613 | ta_status.poly_context_size = 3; |
nkeynes@189 | 614 | ta_status.poly_context[0] = (data[1].i & 0xFC1FFFFF) | |
nkeynes@189 | 615 | ((data[0].i & 0x0B)<<22) | 0x00400000; |
nkeynes@189 | 616 | if( TA_POLYCMD_IS_SPECULAR(data[0].i) ) { |
nkeynes@189 | 617 | ta_status.poly_context[0] |= 0x01000000; |
nkeynes@189 | 618 | } |
nkeynes@189 | 619 | ta_status.poly_context[1] = data[2].i; |
nkeynes@189 | 620 | ta_status.poly_context[2] = data[3].i; |
nkeynes@189 | 621 | if( data[0].i & TA_POLYCMD_TEXTURED ) { |
nkeynes@189 | 622 | ta_status.poly_vertex_size = 2; |
nkeynes@189 | 623 | ta_status.poly_vertex[2].detail[1] = data[4].i; |
nkeynes@189 | 624 | ta_status.current_vertex_type = TA_VERTEX_TEX_SPRITE; |
nkeynes@189 | 625 | } else { |
nkeynes@189 | 626 | ta_status.poly_vertex_size = 1; |
nkeynes@189 | 627 | ta_status.poly_vertex[2].detail[0] = data[4].i; |
nkeynes@189 | 628 | ta_status.current_vertex_type = TA_VERTEX_SPRITE; |
nkeynes@189 | 629 | } |
nkeynes@189 | 630 | ta_status.vertex_count = 0; |
nkeynes@189 | 631 | ta_status.max_vertex = 4; |
nkeynes@189 | 632 | ta_status.poly_pointer = (ta_status.poly_vertex_size << 21); |
nkeynes@189 | 633 | } |
nkeynes@189 | 634 | |
nkeynes@189 | 635 | /** |
nkeynes@189 | 636 | * Copy the last read vertex into all vertexes up to max_vertex. Used for |
nkeynes@189 | 637 | * Aborted polygons under some circumstances. |
nkeynes@189 | 638 | */ |
nkeynes@189 | 639 | static void ta_fill_vertexes( ) { |
nkeynes@189 | 640 | int i; |
nkeynes@189 | 641 | for( i=ta_status.vertex_count; i<ta_status.max_vertex; i++ ) { |
nkeynes@189 | 642 | memcpy( &ta_status.poly_vertex[i], &ta_status.poly_vertex[ta_status.vertex_count-1], |
nkeynes@189 | 643 | sizeof( struct pvr2_ta_vertex ) ); |
nkeynes@189 | 644 | } |
nkeynes@189 | 645 | ta_status.vertex_count = ta_status.max_vertex; |
nkeynes@189 | 646 | } |
nkeynes@189 | 647 | |
nkeynes@189 | 648 | static void ta_parse_vertex( union ta_data *data ) { |
nkeynes@189 | 649 | struct pvr2_ta_vertex *vertex = &ta_status.poly_vertex[ta_status.vertex_count]; |
nkeynes@189 | 650 | vertex->x = data[1].f; |
nkeynes@189 | 651 | vertex->y = data[2].f; |
nkeynes@189 | 652 | vertex->z = data[3].f; |
nkeynes@189 | 653 | |
nkeynes@189 | 654 | switch( ta_status.current_vertex_type ) { |
nkeynes@189 | 655 | case TA_VERTEX_PACKED: |
nkeynes@189 | 656 | vertex->detail[0] = data[6].i; |
nkeynes@189 | 657 | break; |
nkeynes@189 | 658 | case TA_VERTEX_FLOAT: |
nkeynes@189 | 659 | vertex->detail[0] = parse_float_colour( data[4].f, data[5].f, data[6].f, data[7].f ); |
nkeynes@189 | 660 | break; |
nkeynes@189 | 661 | case TA_VERTEX_INTENSITY: |
nkeynes@189 | 662 | vertex->detail[0] = parse_intensity_colour( ta_status.intensity1, data[6].f ); |
nkeynes@189 | 663 | break; |
nkeynes@189 | 664 | |
nkeynes@189 | 665 | case TA_VERTEX_TEX_SPEC_PACKED: |
nkeynes@189 | 666 | vertex->detail[3] = data[7].i; /* ARGB */ |
nkeynes@189 | 667 | /* Fallthrough */ |
nkeynes@189 | 668 | case TA_VERTEX_TEX_PACKED: |
nkeynes@189 | 669 | vertex->detail[0] = data[4].i; /* U */ |
nkeynes@189 | 670 | vertex->detail[1] = data[5].i; /* V */ |
nkeynes@189 | 671 | vertex->detail[2] = data[6].i; /* ARGB */ |
nkeynes@189 | 672 | break; |
nkeynes@189 | 673 | case TA_VERTEX_TEX_UV16_SPEC_PACKED: |
nkeynes@189 | 674 | vertex->detail[2] = data[7].i; /* ARGB */ |
nkeynes@189 | 675 | /* Fallthrough */ |
nkeynes@189 | 676 | case TA_VERTEX_TEX_UV16_PACKED: |
nkeynes@189 | 677 | vertex->detail[0] = data[4].i; /* UV */ |
nkeynes@189 | 678 | vertex->detail[1] = data[6].i; /* ARGB */ |
nkeynes@189 | 679 | break; |
nkeynes@189 | 680 | |
nkeynes@189 | 681 | case TA_VERTEX_TEX_FLOAT: |
nkeynes@189 | 682 | case TA_VERTEX_TEX_SPEC_FLOAT: |
nkeynes@189 | 683 | vertex->detail[0] = data[4].i; /* U */ |
nkeynes@189 | 684 | vertex->detail[1] = data[5].i; /* UV */ |
nkeynes@189 | 685 | ta_status.state = STATE_EXPECT_VERTEX_BLOCK2; |
nkeynes@189 | 686 | break; |
nkeynes@189 | 687 | case TA_VERTEX_TEX_UV16_FLOAT: |
nkeynes@189 | 688 | case TA_VERTEX_TEX_UV16_SPEC_FLOAT: |
nkeynes@189 | 689 | vertex->detail[0] = data[4].i; /* UV */ |
nkeynes@189 | 690 | ta_status.state = STATE_EXPECT_VERTEX_BLOCK2; |
nkeynes@189 | 691 | break; |
nkeynes@189 | 692 | |
nkeynes@189 | 693 | case TA_VERTEX_TEX_SPEC_INTENSITY: |
nkeynes@189 | 694 | vertex->detail[3] = parse_intensity_colour( ta_status.intensity2, data[7].f ); |
nkeynes@189 | 695 | /* Fallthrough */ |
nkeynes@189 | 696 | case TA_VERTEX_TEX_INTENSITY: |
nkeynes@189 | 697 | vertex->detail[0] = data[4].i; /* U */ |
nkeynes@189 | 698 | vertex->detail[1] = data[5].i; /* V */ |
nkeynes@189 | 699 | vertex->detail[2] = parse_intensity_colour( ta_status.intensity1, data[6].f ); |
nkeynes@189 | 700 | break; |
nkeynes@189 | 701 | case TA_VERTEX_TEX_UV16_SPEC_INTENSITY: |
nkeynes@189 | 702 | vertex->detail[2] = parse_intensity_colour( ta_status.intensity2, data[7].f ); |
nkeynes@189 | 703 | /* Fallthrough */ |
nkeynes@189 | 704 | case TA_VERTEX_TEX_UV16_INTENSITY: |
nkeynes@189 | 705 | vertex->detail[0] = data[4].i; /* UV */ |
nkeynes@189 | 706 | vertex->detail[1] = parse_intensity_colour( ta_status.intensity1, data[6].f ); |
nkeynes@189 | 707 | break; |
nkeynes@189 | 708 | |
nkeynes@189 | 709 | case TA_VERTEX_PACKED_MOD: |
nkeynes@189 | 710 | vertex->detail[0] = data[4].i; /* ARGB */ |
nkeynes@189 | 711 | vertex->detail[1] = data[5].i; /* ARGB */ |
nkeynes@189 | 712 | break; |
nkeynes@189 | 713 | case TA_VERTEX_INTENSITY_MOD: |
nkeynes@189 | 714 | vertex->detail[0] = parse_intensity_colour( ta_status.intensity1, data[4].f ); |
nkeynes@189 | 715 | vertex->detail[1] = parse_intensity_colour( ta_status.intensity2, data[5].f ); |
nkeynes@189 | 716 | break; |
nkeynes@189 | 717 | |
nkeynes@189 | 718 | case TA_VERTEX_TEX_SPEC_PACKED_MOD: |
nkeynes@189 | 719 | vertex->detail[3] = data[7].i; /* ARGB0 */ |
nkeynes@189 | 720 | /* Fallthrough */ |
nkeynes@189 | 721 | case TA_VERTEX_TEX_PACKED_MOD: |
nkeynes@189 | 722 | vertex->detail[0] = data[4].i; /* U0 */ |
nkeynes@189 | 723 | vertex->detail[1] = data[5].i; /* V0 */ |
nkeynes@189 | 724 | vertex->detail[2] = data[6].i; /* ARGB0 */ |
nkeynes@189 | 725 | ta_status.state = STATE_EXPECT_VERTEX_BLOCK2; |
nkeynes@189 | 726 | break; |
nkeynes@189 | 727 | case TA_VERTEX_TEX_UV16_SPEC_PACKED_MOD: |
nkeynes@189 | 728 | vertex->detail[2] = data[7].i; /* ARGB0 */ |
nkeynes@189 | 729 | /* Fallthrough */ |
nkeynes@189 | 730 | case TA_VERTEX_TEX_UV16_PACKED_MOD: |
nkeynes@189 | 731 | vertex->detail[0] = data[4].i; /* UV0 */ |
nkeynes@189 | 732 | vertex->detail[1] = data[6].i; /* ARGB0 */ |
nkeynes@189 | 733 | ta_status.state = STATE_EXPECT_VERTEX_BLOCK2; |
nkeynes@189 | 734 | break; |
nkeynes@189 | 735 | |
nkeynes@189 | 736 | case TA_VERTEX_TEX_SPEC_INTENSITY_MOD: |
nkeynes@189 | 737 | vertex->detail[3] = parse_intensity_colour( ta_status.intensity1, data[7].f ); |
nkeynes@189 | 738 | /* Fallthrough */ |
nkeynes@189 | 739 | case TA_VERTEX_TEX_INTENSITY_MOD: |
nkeynes@189 | 740 | vertex->detail[0] = data[4].i; /* U0 */ |
nkeynes@189 | 741 | vertex->detail[1] = data[5].i; /* V0 */ |
nkeynes@189 | 742 | vertex->detail[2] = parse_intensity_colour( ta_status.intensity1, data[6].f ); |
nkeynes@189 | 743 | ta_status.state = STATE_EXPECT_VERTEX_BLOCK2; |
nkeynes@189 | 744 | break; |
nkeynes@189 | 745 | case TA_VERTEX_TEX_UV16_SPEC_INTENSITY_MOD: |
nkeynes@189 | 746 | vertex->detail[2] = parse_intensity_colour( ta_status.intensity1, data[7].f ); |
nkeynes@189 | 747 | /* Fallthrough */ |
nkeynes@189 | 748 | case TA_VERTEX_TEX_UV16_INTENSITY_MOD: |
nkeynes@189 | 749 | vertex->detail[0] = data[4].i; /* UV0 */ |
nkeynes@189 | 750 | vertex->detail[1] = parse_intensity_colour( ta_status.intensity1, data[6].f ); |
nkeynes@189 | 751 | ta_status.state = STATE_EXPECT_VERTEX_BLOCK2; |
nkeynes@189 | 752 | break; |
nkeynes@189 | 753 | |
nkeynes@189 | 754 | case TA_VERTEX_SPRITE: |
nkeynes@189 | 755 | case TA_VERTEX_TEX_SPRITE: |
nkeynes@189 | 756 | case TA_VERTEX_MOD_VOLUME: |
nkeynes@189 | 757 | vertex++; |
nkeynes@189 | 758 | vertex->x = data[4].f; |
nkeynes@189 | 759 | vertex->y = data[5].f; |
nkeynes@189 | 760 | vertex->z = data[6].f; |
nkeynes@189 | 761 | vertex++; |
nkeynes@189 | 762 | vertex->x = data[7].f; |
nkeynes@189 | 763 | ta_status.vertex_count += 2; |
nkeynes@189 | 764 | ta_status.state = STATE_EXPECT_VERTEX_BLOCK2; |
nkeynes@189 | 765 | break; |
nkeynes@189 | 766 | } |
nkeynes@189 | 767 | ta_status.vertex_count++; |
nkeynes@189 | 768 | } |
nkeynes@189 | 769 | |
nkeynes@189 | 770 | static void ta_parse_vertex_block2( union ta_data *data ) { |
nkeynes@189 | 771 | struct pvr2_ta_vertex *vertex = &ta_status.poly_vertex[ta_status.vertex_count-1]; |
nkeynes@189 | 772 | |
nkeynes@189 | 773 | switch( ta_status.current_vertex_type ) { |
nkeynes@189 | 774 | case TA_VERTEX_TEX_SPEC_FLOAT: |
nkeynes@189 | 775 | vertex->detail[3] = parse_float_colour( data[4].f, data[5].f, data[6].f, data[7].f ); |
nkeynes@189 | 776 | /* Fallthrough */ |
nkeynes@189 | 777 | case TA_VERTEX_TEX_FLOAT: |
nkeynes@189 | 778 | vertex->detail[2] = parse_float_colour( data[0].f, data[1].f, data[2].f, data[3].f ); |
nkeynes@189 | 779 | break; |
nkeynes@189 | 780 | case TA_VERTEX_TEX_UV16_SPEC_FLOAT: |
nkeynes@189 | 781 | vertex->detail[2] = parse_float_colour( data[4].f, data[5].f, data[6].f, data[7].f ); |
nkeynes@189 | 782 | /* Fallthrough */ |
nkeynes@189 | 783 | case TA_VERTEX_TEX_UV16_FLOAT: |
nkeynes@189 | 784 | vertex->detail[1] = parse_float_colour( data[0].f, data[1].f, data[2].f, data[3].f ); |
nkeynes@189 | 785 | break; |
nkeynes@189 | 786 | case TA_VERTEX_TEX_PACKED_MOD: |
nkeynes@189 | 787 | vertex->detail[3] = data[0].i; /* U1 */ |
nkeynes@189 | 788 | vertex->detail[4] = data[1].i; /* V1 */ |
nkeynes@189 | 789 | vertex->detail[5] = data[2].i; /* ARGB1 */ |
nkeynes@189 | 790 | break; |
nkeynes@189 | 791 | case TA_VERTEX_TEX_SPEC_PACKED_MOD: |
nkeynes@189 | 792 | vertex->detail[4] = data[0].i; /* U1 */ |
nkeynes@189 | 793 | vertex->detail[5] = data[1].i; /* V1 */ |
nkeynes@189 | 794 | vertex->detail[6] = data[2].i; /* ARGB1 */ |
nkeynes@189 | 795 | vertex->detail[7] = data[3].i; /* ARGB1 */ |
nkeynes@189 | 796 | break; |
nkeynes@189 | 797 | case TA_VERTEX_TEX_UV16_PACKED_MOD: |
nkeynes@189 | 798 | vertex->detail[2] = data[0].i; /* UV1 */ |
nkeynes@189 | 799 | vertex->detail[3] = data[2].i; /* ARGB1 */ |
nkeynes@189 | 800 | break; |
nkeynes@189 | 801 | case TA_VERTEX_TEX_UV16_SPEC_PACKED_MOD: |
nkeynes@189 | 802 | vertex->detail[3] = data[0].i; /* UV1 */ |
nkeynes@189 | 803 | vertex->detail[4] = data[2].i; /* ARGB1 */ |
nkeynes@189 | 804 | vertex->detail[5] = data[3].i; /* ARGB1 */ |
nkeynes@189 | 805 | break; |
nkeynes@189 | 806 | |
nkeynes@189 | 807 | case TA_VERTEX_TEX_INTENSITY_MOD: |
nkeynes@189 | 808 | vertex->detail[3] = data[0].i; /* U1 */ |
nkeynes@189 | 809 | vertex->detail[4] = data[1].i; /* V1 */ |
nkeynes@189 | 810 | vertex->detail[5] = parse_intensity_colour( ta_status.intensity2, data[2].f ); /* ARGB1 */ |
nkeynes@189 | 811 | break; |
nkeynes@189 | 812 | case TA_VERTEX_TEX_SPEC_INTENSITY_MOD: |
nkeynes@189 | 813 | vertex->detail[4] = data[0].i; /* U1 */ |
nkeynes@189 | 814 | vertex->detail[5] = data[1].i; /* V1 */ |
nkeynes@189 | 815 | vertex->detail[6] = parse_intensity_colour( ta_status.intensity2, data[2].f ); /* ARGB1 */ |
nkeynes@189 | 816 | vertex->detail[7] = parse_intensity_colour( ta_status.intensity2, data[3].f ); /* ARGB1 */ |
nkeynes@189 | 817 | break; |
nkeynes@189 | 818 | case TA_VERTEX_TEX_UV16_INTENSITY_MOD: |
nkeynes@189 | 819 | vertex->detail[2] = data[0].i; /* UV1 */ |
nkeynes@189 | 820 | vertex->detail[3] = parse_intensity_colour( ta_status.intensity2, data[2].f ); /* ARGB1 */ |
nkeynes@189 | 821 | break; |
nkeynes@189 | 822 | case TA_VERTEX_TEX_UV16_SPEC_INTENSITY_MOD: |
nkeynes@189 | 823 | vertex->detail[3] = data[0].i; /* UV1 */ |
nkeynes@189 | 824 | vertex->detail[4] = parse_intensity_colour( ta_status.intensity2, data[2].f ); /* ARGB1 */ |
nkeynes@189 | 825 | vertex->detail[5] = parse_intensity_colour( ta_status.intensity2, data[3].f ); /* ARGB1 */ |
nkeynes@189 | 826 | break; |
nkeynes@189 | 827 | |
nkeynes@189 | 828 | case TA_VERTEX_SPRITE: |
nkeynes@189 | 829 | vertex->y = data[0].f; |
nkeynes@189 | 830 | vertex->z = data[1].f; |
nkeynes@189 | 831 | vertex++; |
nkeynes@189 | 832 | ta_status.vertex_count++; |
nkeynes@189 | 833 | vertex->x = data[2].f; |
nkeynes@189 | 834 | vertex->y = data[3].f; |
nkeynes@189 | 835 | vertex->z = 0; |
nkeynes@189 | 836 | vertex->detail[0] = 0; |
nkeynes@189 | 837 | ta_status.poly_vertex[0].detail[0] = 0; |
nkeynes@189 | 838 | ta_status.poly_vertex[1].detail[0] = 0; |
nkeynes@189 | 839 | break; |
nkeynes@189 | 840 | case TA_VERTEX_TEX_SPRITE: |
nkeynes@189 | 841 | vertex->y = data[0].f; |
nkeynes@189 | 842 | vertex->z = data[1].f; |
nkeynes@189 | 843 | vertex++; |
nkeynes@189 | 844 | ta_status.vertex_count++; |
nkeynes@189 | 845 | vertex->x = data[2].f; |
nkeynes@189 | 846 | vertex->y = data[3].f; |
nkeynes@189 | 847 | vertex->z = 0; |
nkeynes@189 | 848 | vertex->detail[0] = 0; |
nkeynes@189 | 849 | vertex->detail[1] = 0; |
nkeynes@189 | 850 | ta_status.poly_vertex[0].detail[0] = data[5].i; |
nkeynes@189 | 851 | ta_status.poly_vertex[0].detail[1] = 0; |
nkeynes@189 | 852 | ta_status.poly_vertex[1].detail[0] = data[6].i; |
nkeynes@189 | 853 | ta_status.poly_vertex[1].detail[1] = 0; |
nkeynes@189 | 854 | ta_status.poly_vertex[2].detail[0] = data[7].i; |
nkeynes@189 | 855 | break; |
nkeynes@189 | 856 | case TA_VERTEX_MOD_VOLUME: |
nkeynes@189 | 857 | vertex->y = data[0].f; |
nkeynes@189 | 858 | vertex->z = data[1].f; |
nkeynes@189 | 859 | break; |
nkeynes@189 | 860 | } |
nkeynes@189 | 861 | ta_status.state = STATE_IN_LIST; |
nkeynes@189 | 862 | } |
nkeynes@189 | 863 | |
nkeynes@189 | 864 | /** |
nkeynes@189 | 865 | * Process 1 32-byte block of ta data |
nkeynes@189 | 866 | */ |
nkeynes@189 | 867 | void pvr2_ta_process_block( char *input ) { |
nkeynes@189 | 868 | union ta_data *data = (union ta_data *)input; |
nkeynes@189 | 869 | |
nkeynes@189 | 870 | switch( ta_status.state ) { |
nkeynes@189 | 871 | case STATE_ERROR: |
nkeynes@189 | 872 | /* Error raised - stop processing until reset */ |
nkeynes@189 | 873 | return; |
nkeynes@189 | 874 | |
nkeynes@189 | 875 | case STATE_EXPECT_POLY_BLOCK2: |
nkeynes@189 | 876 | /* This is always a pair of floating-point colours */ |
nkeynes@189 | 877 | ta_status.intensity1 = |
nkeynes@189 | 878 | parse_float_colour( data[0].f, data[1].f, data[2].f, data[3].f ); |
nkeynes@189 | 879 | ta_status.intensity2 = |
nkeynes@189 | 880 | parse_float_colour( data[4].f, data[5].f, data[6].f, data[7].f ); |
nkeynes@189 | 881 | ta_status.state = STATE_IN_LIST; |
nkeynes@189 | 882 | break; |
nkeynes@189 | 883 | |
nkeynes@189 | 884 | case STATE_EXPECT_VERTEX_BLOCK2: |
nkeynes@189 | 885 | ta_parse_vertex_block2( data ); |
nkeynes@189 | 886 | if( ta_status.vertex_count == ta_status.max_vertex ) { |
nkeynes@189 | 887 | ta_split_polygon(); |
nkeynes@189 | 888 | } |
nkeynes@189 | 889 | break; |
nkeynes@189 | 890 | |
nkeynes@189 | 891 | case STATE_EXPECT_END_VERTEX_BLOCK2: |
nkeynes@189 | 892 | ta_parse_vertex_block2( data ); |
nkeynes@189 | 893 | ta_commit_polygon(); |
nkeynes@189 | 894 | ta_status.vertex_count = 0; |
nkeynes@189 | 895 | ta_status.poly_parity = 0; |
nkeynes@189 | 896 | |
nkeynes@189 | 897 | case STATE_IN_LIST: |
nkeynes@189 | 898 | case STATE_IDLE: |
nkeynes@189 | 899 | switch( TA_CMD( data->i ) ) { |
nkeynes@189 | 900 | case TA_CMD_END_LIST: |
nkeynes@189 | 901 | ta_end_list(); |
nkeynes@189 | 902 | break; |
nkeynes@189 | 903 | case TA_CMD_CLIP: /* TODO */ |
nkeynes@189 | 904 | break; |
nkeynes@189 | 905 | case TA_CMD_POLYGON_CONTEXT: |
nkeynes@189 | 906 | if( ta_status.state == STATE_IDLE ) { |
nkeynes@189 | 907 | ta_init_list( TA_POLYCMD_LISTTYPE( data->i ) ); |
nkeynes@189 | 908 | } |
nkeynes@189 | 909 | |
nkeynes@189 | 910 | if( ta_status.vertex_count != 0 ) { |
nkeynes@189 | 911 | ta_fill_vertexes(); |
nkeynes@189 | 912 | ta_commit_polygon(); |
nkeynes@189 | 913 | } |
nkeynes@189 | 914 | |
nkeynes@189 | 915 | if( TA_IS_MODIFIER_LIST( ta_status.current_list_type ) ) { |
nkeynes@189 | 916 | ta_parse_modifier_context(data); |
nkeynes@189 | 917 | } else { |
nkeynes@189 | 918 | ta_parse_polygon_context(data); |
nkeynes@189 | 919 | } |
nkeynes@189 | 920 | break; |
nkeynes@189 | 921 | case TA_CMD_SPRITE_CONTEXT: |
nkeynes@189 | 922 | if( ta_status.state == STATE_IDLE ) { |
nkeynes@189 | 923 | ta_init_list( TA_POLYCMD_LISTTYPE( data->i ) ); |
nkeynes@189 | 924 | } |
nkeynes@189 | 925 | |
nkeynes@189 | 926 | if( ta_status.vertex_count != 0 ) { |
nkeynes@189 | 927 | ta_fill_vertexes(); |
nkeynes@189 | 928 | ta_commit_polygon(); |
nkeynes@189 | 929 | } |
nkeynes@189 | 930 | |
nkeynes@189 | 931 | ta_parse_sprite_context(data); |
nkeynes@189 | 932 | break; |
nkeynes@189 | 933 | case TA_CMD_VERTEX: |
nkeynes@189 | 934 | ta_parse_vertex(data); |
nkeynes@189 | 935 | |
nkeynes@189 | 936 | if( ta_status.state == STATE_EXPECT_VERTEX_BLOCK2 ) { |
nkeynes@189 | 937 | if( TA_IS_END_VERTEX(data[0].i) ) { |
nkeynes@189 | 938 | ta_status.state = STATE_EXPECT_END_VERTEX_BLOCK2; |
nkeynes@189 | 939 | } |
nkeynes@189 | 940 | } else if( TA_IS_END_VERTEX(data->i) ) { |
nkeynes@189 | 941 | ta_commit_polygon(); |
nkeynes@189 | 942 | ta_status.vertex_count = 0; |
nkeynes@189 | 943 | ta_status.poly_parity = 0; |
nkeynes@189 | 944 | } else if( ta_status.vertex_count == ta_status.max_vertex ) { |
nkeynes@189 | 945 | ta_split_polygon(); |
nkeynes@189 | 946 | } |
nkeynes@189 | 947 | break; |
nkeynes@189 | 948 | } |
nkeynes@189 | 949 | break; |
nkeynes@189 | 950 | } |
nkeynes@189 | 951 | |
nkeynes@189 | 952 | } |
nkeynes@189 | 953 | |
nkeynes@189 | 954 | |
nkeynes@189 | 955 | |
nkeynes@189 | 956 | /** |
nkeynes@189 | 957 | * Write a block of data to the tile accelerator, adding the data to the |
nkeynes@189 | 958 | * current scene. We don't make any particular attempt to interpret the data |
nkeynes@189 | 959 | * at this stage, deferring that until render time. |
nkeynes@189 | 960 | * |
nkeynes@189 | 961 | * Currently copies the data verbatim to the vertex buffer, processing only |
nkeynes@189 | 962 | * far enough to generate the correct end-of-list events. Tile buffer is |
nkeynes@189 | 963 | * entirely ignored. |
nkeynes@189 | 964 | */ |
nkeynes@189 | 965 | void pvr2_ta_write( char *buf, uint32_t length ) |
nkeynes@189 | 966 | { |
nkeynes@189 | 967 | if( ta_status.debug_output ) { |
nkeynes@189 | 968 | fwrite_dump32( (uint32_t *)buf, length, stderr ); |
nkeynes@189 | 969 | } |
nkeynes@189 | 970 | |
nkeynes@189 | 971 | for( ; length >=32; length -= 32 ) { |
nkeynes@189 | 972 | pvr2_ta_process_block( buf ); |
nkeynes@189 | 973 | buf += 32; |
nkeynes@189 | 974 | } |
nkeynes@189 | 975 | } |
.