From 2c039b8907e32ca7cc755b9d5e80ce5554635658 Mon Sep 17 00:00:00 2001 From: Chris Taylor Date: Sat, 30 Jul 2005 07:48:55 +0000 Subject: [PATCH] remove old _3DFX code --- 2d/bitblt.c | 8 +------- ChangeLog | 3 +++ main/gamerend.c | 9 ++------- main/inferno.c | 6 +----- main/object.c | 15 +-------------- main/polyobj.c | 24 ++---------------------- 6 files changed, 10 insertions(+), 55 deletions(-) diff --git a/2d/bitblt.c b/2d/bitblt.c index e8baad54..d5923e07 100644 --- a/2d/bitblt.c +++ b/2d/bitblt.c @@ -1,4 +1,4 @@ -/* $Id: bitblt.c,v 1.18 2005-07-30 01:51:42 chris Exp $ */ +/* $Id: bitblt.c,v 1.19 2005-07-30 07:48:24 chris Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -1696,12 +1696,6 @@ void gr_ubitmapm( int x, int y, grs_bitmap *bm ) Assert(y+bm->bm_h <= grd_curcanv->cv_h); #endif -#ifdef _3DFX - _3dfx_Blit( x, y, bm ); - if ( _3dfx_skip_ddraw ) - return; -#endif - if (source==BM_LINEAR) { switch( dest ) { diff --git a/ChangeLog b/ChangeLog index dbd39da7..1e4d1faa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,6 +12,9 @@ remove all the redundant Polygon Acceleration stuff (include/pa_enabl.h) + * 2d/bitblt.c, main/gamerend.c, main/inferno.c, main/object.c, + main/polyobj.c: remove old _3DFX code + 2005-07-29 Chris Taylor * 2d/font.c: show some missing wide 1's (bug #2269) diff --git a/main/gamerend.c b/main/gamerend.c index c6d4d7ee..ff11b6bd 100644 --- a/main/gamerend.c +++ b/main/gamerend.c @@ -1,4 +1,4 @@ -/* $Id: gamerend.c,v 1.16 2005-07-30 01:50:17 chris Exp $ */ +/* $Id: gamerend.c,v 1.17 2005-07-30 07:46:03 chris Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -23,7 +23,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #endif #ifdef RCS -static char rcsid[] = "$Id: gamerend.c,v 1.16 2005-07-30 01:50:17 chris Exp $"; +static char rcsid[] = "$Id: gamerend.c,v 1.17 2005-07-30 07:46:03 chris Exp $"; #endif #ifdef WINDOWS @@ -1143,11 +1143,6 @@ void game_render_frame_mono(void) &VR_render_sub_buffer[0].cv_bitmap, &VR_screen_pages[0].cv_bitmap ); #endif - - #ifdef _3DFX - _3dfx_BufferSwap(); - #endif - } } else { #if 1 //def MACINTOSH diff --git a/main/inferno.c b/main/inferno.c index 16406cad..874da5a5 100644 --- a/main/inferno.c +++ b/main/inferno.c @@ -1,4 +1,4 @@ -/* $Id: inferno.c,v 1.102 2005-07-30 01:50:17 chris Exp $ */ +/* $Id: inferno.c,v 1.103 2005-07-30 07:46:03 chris Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -766,10 +766,6 @@ int main(int argc, char *argv[]) if ((t=gr_init())!=0) //doesn't do much Error(TXT_CANT_INIT_GFX,t); - #ifdef _3DFX - _3dfx_Init(); - #endif - // Load the palette stuff. Returns non-zero if error. con_printf(CON_DEBUG, "Initializing palette system...\n" ); gr_use_palette_table(DEFAULT_PALETTE ); diff --git a/main/object.c b/main/object.c index 0802e538..2ee6d1e8 100644 --- a/main/object.c +++ b/main/object.c @@ -1,4 +1,4 @@ -/* $Id: object.c,v 1.17 2005-07-30 01:50:17 chris Exp $ */ +/* $Id: object.c,v 1.18 2005-07-30 07:46:03 chris Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -90,10 +90,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "editor/editor.h" #endif -#ifdef _3DFX -#include "3dfx_des.h" -#endif - void obj_detach_all(object *parent); void obj_detach_one(object *sub); int free_object_slots(int num_used); @@ -305,16 +301,7 @@ void draw_object_tmap_rod(object *obj,bitmap_index bitmapi,int lighted) else light = f1_0; - #ifdef _3DFX - _3dfx_rendering_poly_obj = 1; - #endif - g3_draw_rod_tmap(bitmap,&bot_p,obj->size,&top_p,obj->size,light); - - #ifdef _3DFX - _3dfx_rendering_poly_obj = 0; - #endif - } int Linear_tmap_polygon_objects = 1; diff --git a/main/polyobj.c b/main/polyobj.c index ca5107b8..a4edf574 100644 --- a/main/polyobj.c +++ b/main/polyobj.c @@ -1,4 +1,4 @@ -/* $Id: polyobj.c,v 1.21 2005-07-30 01:50:17 chris Exp $ */ +/* $Id: polyobj.c,v 1.22 2005-07-30 07:46:03 chris Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -24,7 +24,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #endif #ifdef RCS -static char rcsid[] = "$Id: polyobj.c,v 1.21 2005-07-30 01:50:17 chris Exp $"; +static char rcsid[] = "$Id: polyobj.c,v 1.22 2005-07-30 07:46:03 chris Exp $"; #endif #include @@ -57,10 +57,6 @@ static char rcsid[] = "$Id: polyobj.c,v 1.21 2005-07-30 01:50:17 chris Exp $"; #include "piggy.h" #endif -#ifdef _3DFX -#include "3dfx_des.h" -#endif - #ifdef OGL #include "ogl_init.h" #endif @@ -630,10 +626,6 @@ void draw_polygon_model(vms_vector *pos,vms_matrix *orient,vms_angvec *anim_angl for (i=0;in_textures;i++) { texture_list_index[i] = alt_textures[i]; texture_list[i] = &GameBitmaps[alt_textures[i].index]; - - #ifdef _3DFX - texture_list[i]->bm_handle = texture_list_index[i].index; - #endif } } else @@ -641,10 +633,6 @@ void draw_polygon_model(vms_vector *pos,vms_matrix *orient,vms_angvec *anim_angl for (i=0;in_textures;i++) { texture_list_index[i] = ObjBitmaps[ObjBitmapPtrs[po->first_texture+i]]; texture_list[i] = &GameBitmaps[ObjBitmaps[ObjBitmapPtrs[po->first_texture+i]].index]; - - #ifdef _3DFX - texture_list[i]->bm_handle = texture_list_index[i].index; - #endif } } @@ -668,10 +656,6 @@ void draw_polygon_model(vms_vector *pos,vms_matrix *orient,vms_angvec *anim_angl g3_set_interp_points(robot_points); -#ifdef _3DFX - _3dfx_rendering_poly_obj = 1; -#endif - if (flags == 0) //draw entire object g3_draw_polygon_model(po->model_data,texture_list,anim_angles,light,glow_values); @@ -698,10 +682,6 @@ void draw_polygon_model(vms_vector *pos,vms_matrix *orient,vms_angvec *anim_angl } g3_done_instance(); - -#ifdef _3DFX - _3dfx_rendering_poly_obj = 0; -#endif } void free_polygon_models() -- 2.39.2