From ee8bdb07422e6e7550abee902872651806e1a18b Mon Sep 17 00:00:00 2001 From: Ragnvald Maartmann-Moe IV Date: Sun, 20 May 2001 21:44:05 +0000 Subject: [PATCH] sw_rvars.c was just a little bit silly for a simple variable declaration. --- nq/source/Makefile.am | 2 +- nq/source/sw_rmain.c | 3 +++ nq/source/sw_rvars.c | 45 ------------------------------------------- qw/source/Makefile.am | 2 +- qw/source/sw_rmain.c | 3 +++ qw/source/sw_rvars.c | 45 ------------------------------------------- 6 files changed, 8 insertions(+), 92 deletions(-) delete mode 100644 nq/source/sw_rvars.c delete mode 100644 qw/source/sw_rvars.c diff --git a/nq/source/Makefile.am b/nq/source/Makefile.am index 4c4f3d077..cd8c21ea4 100644 --- a/nq/source/Makefile.am +++ b/nq/source/Makefile.am @@ -89,7 +89,7 @@ soft_SOURCES= d_edge.c d_fill.c d_init.c d_modech.c d_part.c d_polyse.c \ d_scan.c d_sky.c d_sprite.c d_surf.c d_vars.c d_zpoint.c \ draw.c screen.c sw_raclip.c sw_ralias.c sw_rbsp.c sw_rdraw.c \ sw_redge.c sw_rlight.c sw_rmain.c sw_rmisc.c sw_rpart.c sw_rsky.c \ - sw_rsprite.c sw_rsurf.c sw_rvars.c sw_skin.c \ + sw_rsprite.c sw_rsurf.c sw_skin.c \ sw_view.c $(soft_ASM) # ... Linux FBDev diff --git a/nq/source/sw_rmain.c b/nq/source/sw_rmain.c index ee62049dc..a464641bd 100644 --- a/nq/source/sw_rmain.c +++ b/nq/source/sw_rmain.c @@ -53,6 +53,9 @@ #include "r_local.h" #include "view.h" +#ifndef USE_INTEL_ASM +int r_bmodelactive; +#endif void *colormap; vec3_t viewlightvec; diff --git a/nq/source/sw_rvars.c b/nq/source/sw_rvars.c deleted file mode 100644 index 1b239abfa..000000000 --- a/nq/source/sw_rvars.c +++ /dev/null @@ -1,45 +0,0 @@ -/* - r_vars.c - - global refresh variables - - Copyright (C) 1996-1997 Id Software, Inc. - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public License - as published by the Free Software Foundation; either version 2 - of the License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - - See the GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to: - - Free Software Foundation, Inc. - 59 Temple Place - Suite 330 - Boston, MA 02111-1307, USA - - $Id$ -*/ - -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - -#ifndef USE_INTEL_ASM - -// all global and static refresh variables are collected in a contiguous block -// to avoid cache conflicts. - -// global refresh variables ----------------------------- - -// FIXME: make into one big structure, like cl or sv -// FIXME: do separately for refresh engine and driver - -int r_bmodelactive; - -#endif // !USE_INTEL_ASM diff --git a/qw/source/Makefile.am b/qw/source/Makefile.am index 7ae57f466..52f5c913b 100644 --- a/qw/source/Makefile.am +++ b/qw/source/Makefile.am @@ -108,7 +108,7 @@ soft_SOURCES= d_edge.c d_fill.c d_init.c d_modech.c \ d_part.c d_polyse.c d_scan.c d_sky.c d_sprite.c d_surf.c \ d_vars.c d_zpoint.c draw.c sw_raclip.c sw_ralias.c sw_rbsp.c \ sw_rdraw.c sw_redge.c sw_rlight.c sw_rmain.c sw_rmisc.c \ - sw_rpart.c sw_rsky.c sw_rsprite.c sw_rsurf.c sw_rvars.c sw_skin.c \ + sw_rpart.c sw_rsky.c sw_rsprite.c sw_rsurf.c sw_skin.c \ sw_view.c screen.c \ \ d_draw.S d_draw16.S d_parta.S d_polysa.S d_scana.S d_spr8.S \ diff --git a/qw/source/sw_rmain.c b/qw/source/sw_rmain.c index ee62049dc..a464641bd 100644 --- a/qw/source/sw_rmain.c +++ b/qw/source/sw_rmain.c @@ -53,6 +53,9 @@ #include "r_local.h" #include "view.h" +#ifndef USE_INTEL_ASM +int r_bmodelactive; +#endif void *colormap; vec3_t viewlightvec; diff --git a/qw/source/sw_rvars.c b/qw/source/sw_rvars.c deleted file mode 100644 index 1b239abfa..000000000 --- a/qw/source/sw_rvars.c +++ /dev/null @@ -1,45 +0,0 @@ -/* - r_vars.c - - global refresh variables - - Copyright (C) 1996-1997 Id Software, Inc. - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public License - as published by the Free Software Foundation; either version 2 - of the License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - - See the GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to: - - Free Software Foundation, Inc. - 59 Temple Place - Suite 330 - Boston, MA 02111-1307, USA - - $Id$ -*/ - -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - -#ifndef USE_INTEL_ASM - -// all global and static refresh variables are collected in a contiguous block -// to avoid cache conflicts. - -// global refresh variables ----------------------------- - -// FIXME: make into one big structure, like cl or sv -// FIXME: do separately for refresh engine and driver - -int r_bmodelactive; - -#endif // !USE_INTEL_ASM