fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 07:28:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

r300: Removed the (completely broken since new VBO branch) OPTIMIZE_ELTS path.

Browse source 
The VTXFMT code was broken by the new VBO branch and the OPTIMIZE_ELTS path
relied on the VTXFMT code...

I'm not even sure if the OPTIMIZE_ELTS path ever worked; the testing that I did
after minimizing the code duplication would have taken the same path as the
non-OPTIMIZE_ELTS code.
This commit is contained in:
Oliver McFadden 2007-05-27 23:35:12 +00:00
parent 7c893e98a3
commit 3e5f8a6c89
2 changed files with 0 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/mesa/drivers/dri/r300/r300_context.h
View file

@ -49,8 +49,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#define USER_BUFFERS
//#define OPTIMIZE_ELTS
struct r300_context;
typedef struct r300_context r300ContextRec;
typedef struct r300_context *r300ContextPtr;

20
src/mesa/drivers/dri/r300/r300_render.c
View file

@ -205,8 +205,6 @@ static void r300FireEB(r300ContextPtr rmesa, unsigned long addr,
int cmd_reserved = 0;
int cmd_written = 0;
drm_radeon_cmd_header_t *cmd = NULL;
unsigned long t_addr;
unsigned long magic_1, magic_2;
assert(elt_size == 2 || elt_size == 4);
@ -215,10 +213,6 @@ static void r300FireEB(r300ContextPtr rmesa, unsigned long addr,
return;
}
magic_1 = (addr % 32) / 4;
t_addr = addr & ~0x1d;
magic_2 = (vertex_count + 1 + (t_addr & 0x2)) / 2 + magic_1;
start_packet3(RADEON_CP_PACKET3_3D_DRAW_INDX_2, 0);
if (elt_size == 4) {
e32(R300_VAP_VF_CNTL__PRIM_WALK_INDICES | (vertex_count << 16) | type | R300_VAP_VF_CNTL__INDEX_SIZE_32bit);
@ -227,27 +221,13 @@ static void r300FireEB(r300ContextPtr rmesa, unsigned long addr,
}
start_packet3(RADEON_CP_PACKET3_INDX_BUFFER, 2);
#ifdef OPTIMIZE_ELTS
if (elt_size == 4) {
e32(R300_EB_UNK1 | (0 << 16) | R300_EB_UNK2);
e32(addr);
} else {
e32(R300_EB_UNK1 | (magic_1 << 16) | R300_EB_UNK2);
e32(t_addr);
}
#else
e32(R300_EB_UNK1 | (0 << 16) | R300_EB_UNK2);
e32(addr);
#endif
if (elt_size == 4) {
e32(vertex_count);
} else {
#ifdef OPTIMIZE_ELTS
e32(magic_2);
#else
e32((vertex_count + 1) / 2);
#endif
}
}