[Atsoft-commit] CVS: dcgen/main Makefile,1.4,1.5 generator.c,1.9,1.10 ta_text.c,1.3,1.4 ui-kos.c,1.5,1.6 sndstream.c,1.1.1.1,NONE

[Mike D. <at...@us...>]

Update of /cvsroot/atsoft/dcgen/main
In directory usw-pr-cvs1:/tmp/cvs-serv21015/main

Modified Files:
	Makefile generator.c ta_text.c ui-kos.c 
Removed Files:
	sndstream.c 
Log Message:
1) Completed the pvr_* migration.
2) Cleaned up the cpu68k to remove about 11kb of "dead" code
3) See ChangeLog for more details.



Index: Makefile
===================================================================
RCS file: /cvsroot/atsoft/dcgen/main/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Makefile	26 Jan 2002 03:51:44 -0000	1.4
--- Makefile	13 Feb 2002 07:57:25 -0000	1.5
***************
*** 1,5 ****
  
  #OBJS = cpu68k.o cpuz80.o event.o font.o generator.o gensound.o initcart.o logo.o mem68k.o memz80.o reg68k.o snprintf.o state.o ui-console.o vdp.o gensoundp-kos.o uip-kos.o uiplot.o sndstream.o ta_text.o
! OBJS = cpu68k.o cpuz80.o event.o font.o generator.o gensound.o initcart.o logo.o mem68k.o memz80.o reg68k.o snprintf.o state.o vdp.o gensoundp-kos.o ui-kos.o sndstream.o ta_text.o
  SUBDIRS = 
  
--- 1,5 ----
  
  #OBJS = cpu68k.o cpuz80.o event.o font.o generator.o gensound.o initcart.o logo.o mem68k.o memz80.o reg68k.o snprintf.o state.o ui-console.o vdp.o gensoundp-kos.o uip-kos.o uiplot.o sndstream.o ta_text.o
! OBJS = cpu68k.o cpuz80.o event.o font.o generator.o gensound.o initcart.o logo.o mem68k.o memz80.o reg68k.o snprintf.o state.o vdp.o gensoundp-kos.o ui-kos.o ta_text.o
  SUBDIRS = 
  

Index: generator.c
===================================================================
RCS file: /cvsroot/atsoft/dcgen/main/generator.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** generator.c	10 Feb 2002 22:41:06 -0000	1.9
--- generator.c	13 Feb 2002 07:57:25 -0000	1.10
***************
*** 127,131 ****
  	pvr_scene_begin();
  	pvr_list_begin(PVR_LIST_OP_POLY);
! 	pvr_dummy_poly(TA_OPAQUE);
  	pvr_list_finish();
  	pvr_list_begin(PVR_LIST_TR_POLY);
--- 127,131 ----
  	pvr_scene_begin();
  	pvr_list_begin(PVR_LIST_OP_POLY);
! 	pvr_dummy_poly(PVR_LIST_OP_POLY);
  	pvr_list_finish();
  	pvr_list_begin(PVR_LIST_TR_POLY);
***************
*** 269,273 ****
  	pvr_scene_begin();
  	pvr_list_begin(PVR_LIST_OP_POLY);
! 	pvr_dummy_poly(TA_OPAQUE);
  	pvr_list_finish();
  	pvr_list_begin(PVR_LIST_TR_POLY);
--- 269,273 ----
  	pvr_scene_begin();
  	pvr_list_begin(PVR_LIST_OP_POLY);
! 	pvr_dummy_poly(PVR_LIST_OP_POLY);
  	pvr_list_finish();
  	pvr_list_begin(PVR_LIST_TR_POLY);

Index: ta_text.c
===================================================================
RCS file: /cvsroot/atsoft/dcgen/main/ta_text.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ta_text.c	10 Feb 2002 22:41:06 -0000	1.3
--- ta_text.c	13 Feb 2002 07:57:25 -0000	1.4
***************
*** 70,74 ****
  	pvr_prim(&vert, sizeof(vert));
  
! 	vert.flags = TA_VERTEX_EOL;
  	vert.x = x1 + 12.0f;
  	vert.y = y1;
--- 70,74 ----
  	pvr_prim(&vert, sizeof(vert));
  
! 	vert.flags = PVR_CMD_VERTEX_EOL;
  	vert.x = x1 + 12.0f;
  	vert.y = y1;

Index: ui-kos.c
===================================================================
RCS file: /cvsroot/atsoft/dcgen/main/ui-kos.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ui-kos.c	12 Feb 2002 05:56:20 -0000	1.5
--- ui-kos.c	13 Feb 2002 07:57:25 -0000	1.6
***************
*** 99,107 ****
  	PVR_SET(PVR_TEXTURE_MODULO, 10);
  	
! 	pvr_poly_cxt_txr(&pal_tmp, PVR_LIST_TR_POLY, PVR_TXRFMT_PAL8BPP, 512, 512, txr_base, TA_BILINEAR_FILTER);
  #ifdef USE_TWIDDLED_TXR
! 	pvr_poly_cxt_txr(&tmp, PVR_LIST_TR_POLY, PVR_TXRFMT_RGB565, 512, 512, txr_base_ex, TA_BILINEAR_FILTER);
  #else
! 	pvr_poly_cxt_txr(&tmp, PVR_LIST_TR_POLY, PVR_TXRFMT_RGB565|PVR_TXRFMT_NONTWIDDLED, 512, 512, txr_base_ex, TA_BILINEAR_FILTER);
  #endif
  	pvr_poly_compile(&screen_poly, &tmp);
--- 99,107 ----
  	PVR_SET(PVR_TEXTURE_MODULO, 10);
  	
! 	pvr_poly_cxt_txr(&pal_tmp, PVR_LIST_TR_POLY, PVR_TXRFMT_PAL8BPP, 512, 512, txr_base, 0);
  #ifdef USE_TWIDDLED_TXR
! 	pvr_poly_cxt_txr(&tmp, PVR_LIST_TR_POLY, PVR_TXRFMT_RGB565, 512, 512, txr_base_ex, 0);
  #else
! 	pvr_poly_cxt_txr(&tmp, PVR_LIST_TR_POLY, PVR_TXRFMT_RGB565|PVR_TXRFMT_NONTWIDDLED, 512, 512, txr_base_ex, 0);
  #endif
  	pvr_poly_compile(&screen_poly, &tmp);
***************
*** 366,373 ****
  	pvr_scene_begin();
  	pvr_list_begin(PVR_LIST_OP_POLY);
! 	pvr_dummy_poly(TA_OPAQUE);
  	pvr_list_finish();
  	pvr_list_begin(PVR_LIST_TR_POLY);
! 	pvr_dummy_poly(TA_TRANSLUCENT);
  	if(ui_rendermode == PALETTED_TXR)
  	{
--- 366,373 ----
  	pvr_scene_begin();
  	pvr_list_begin(PVR_LIST_OP_POLY);
! 	pvr_dummy_poly(PVR_LIST_OP_POLY);
  	pvr_list_finish();
  	pvr_list_begin(PVR_LIST_TR_POLY);
! 	pvr_dummy_poly(PVR_LIST_TR_POLY);
  	if(ui_rendermode == PALETTED_TXR)
  	{
***************
*** 380,384 ****
  	vert.flags = PVR_CMD_VERTEX;
  	vert.argb = PVR_PACK_COLOR(1,1,1,1);
! 	vert.oargb = PVR_PACK_COLOR(0,0,0,0);
  	vert.z = 256.0f;
  	vert.x = x;
--- 380,385 ----
  	vert.flags = PVR_CMD_VERTEX;
  	vert.argb = PVR_PACK_COLOR(1,1,1,1);
! 	vert.oargb = PVR_PACK_COLOR(1,0,0,0);
! 
  	vert.z = 256.0f;
  	vert.x = x;
***************
*** 387,390 ****
--- 388,392 ----
  	vert.v = vdp_vislines/512.0f;
  	pvr_prim(&vert, sizeof(vert));
+ 	
  	vert.x = x; 
  	vert.y = y;
***************
*** 392,395 ****
--- 394,398 ----
  	vert.v = 0;
  	pvr_prim(&vert, sizeof(vert));
+ 	
  	vert.x = x + x_size;
  	vert.y = y + y_size;
***************
*** 397,400 ****
--- 400,404 ----
  	vert.v = vdp_vislines/512.0f;
  	pvr_prim(&vert, sizeof(vert));
+ 	
  	vert.flags = PVR_CMD_VERTEX_EOL;
  	vert.x = x + x_size;

--- sndstream.c DELETED ---