From f5c01925d4111d2be4e6e1c84f82ed83d8db268b Mon Sep 17 00:00:00 2001 From: Bill Currie Date: Tue, 17 Apr 2001 06:13:51 +0000 Subject: [PATCH] d_8to16table moved to vid_common_sw.c and fix vid_fbdev blackness (must call VID_InitGamma before VID_SetPalette) --- libs/video/targets/vid_common_gl.c | 1 - libs/video/targets/vid_common_sw.c | 2 ++ libs/video/targets/vid_dos.c | 1 - libs/video/targets/vid_fbdev.c | 33 +----------------------------- libs/video/targets/vid_mgl.c | 1 - libs/video/targets/vid_sdl.c | 1 - libs/video/targets/vid_sunx.c | 1 - libs/video/targets/vid_sunxil.c | 1 - libs/video/targets/vid_svgalib.c | 2 -- libs/video/targets/vid_x11.c | 1 - 10 files changed, 3 insertions(+), 41 deletions(-) diff --git a/libs/video/targets/vid_common_gl.c b/libs/video/targets/vid_common_gl.c index f69168f35..30bad0015 100644 --- a/libs/video/targets/vid_common_gl.c +++ b/libs/video/targets/vid_common_gl.c @@ -57,7 +57,6 @@ #define WARP_WIDTH 320 #define WARP_HEIGHT 200 -//unsigned short d_8to16table[256]; unsigned int d_8to24table[256]; unsigned char d_15to8table[65536]; diff --git a/libs/video/targets/vid_common_sw.c b/libs/video/targets/vid_common_sw.c index dfc64b791..9103be8f4 100644 --- a/libs/video/targets/vid_common_sw.c +++ b/libs/video/targets/vid_common_sw.c @@ -36,6 +36,8 @@ #include "QF/sys.h" #include "QF/vid.h" +unsigned short d_8to16table[256]; + void VID_InitBuffers (void) { diff --git a/libs/video/targets/vid_dos.c b/libs/video/targets/vid_dos.c index eeb8d0a05..5711b0049 100644 --- a/libs/video/targets/vid_dos.c +++ b/libs/video/targets/vid_dos.c @@ -83,7 +83,6 @@ byte vid_current_palette[768]; // save for mode changes static qboolean nomodecheck = false; -unsigned short d_8to16table[256]; // not used in 8 bpp mode unsigned d_8to24table[256]; // not used in 8 bpp mode void VID_MenuDraw (void); diff --git a/libs/video/targets/vid_fbdev.c b/libs/video/targets/vid_fbdev.c index dba90695c..6f209df3d 100644 --- a/libs/video/targets/vid_fbdev.c +++ b/libs/video/targets/vid_fbdev.c @@ -69,8 +69,6 @@ #include "fbset.h" -unsigned short d_8to16table[256]; - extern void ReadModeDB(void); extern struct VideoMode *FindVideoMode(const char *name); void ConvertFromVideoMode(const struct VideoMode *vmode, @@ -156,34 +154,6 @@ D_EndDirectRect (int x, int y, int width, int height) } -static void -VID_Gamma_f (void) -{ - float gamma, f, inf; - unsigned char palette[768]; - int i; - - if (Cmd_Argc () == 2) { - gamma = atof (Cmd_Argv (1)); - - for (i = 0; i < 768; i++) { - f = pow ((vid_basepal[i] + 1) / 256.0, gamma); - inf = f * 255 + 0.5; - if (inf < 0) - inf = 0; - if (inf > 255) - inf = 255; - palette[i] = inf; - } - - VID_SetPalette (palette); - - /* Force a surface cache flush */ - vid.recalc_refdef = 1; - } -} - - static void VID_DescribeMode_f (void) { @@ -506,8 +476,6 @@ VID_Init (unsigned char *palette) if (fbdev_inited) return; - Cmd_AddCommand ("gamma", VID_Gamma_f, "No Description"); - if (UseDisplay) { fbname = getenv("FRAMEBUFFER"); if (!fbname) @@ -561,6 +529,7 @@ VID_Init (unsigned char *palette) VID_SetMode (current_mode.name, palette); Con_CheckResize (); // Now that we have a window size, fix console + VID_InitGamma (palette); VID_SetPalette (palette); } } diff --git a/libs/video/targets/vid_mgl.c b/libs/video/targets/vid_mgl.c index 5c2ed6472..f03c45df5 100644 --- a/libs/video/targets/vid_mgl.c +++ b/libs/video/targets/vid_mgl.c @@ -142,7 +142,6 @@ static int VID_highhunkmark; unsigned char vid_curpal[256 * 3]; -unsigned short d_8to16table[256]; unsigned int d_8to24table[256]; int driver = grDETECT, mode; diff --git a/libs/video/targets/vid_sdl.c b/libs/video/targets/vid_sdl.c index 8a1ee8a1c..28b6a4c02 100644 --- a/libs/video/targets/vid_sdl.c +++ b/libs/video/targets/vid_sdl.c @@ -60,7 +60,6 @@ cvar_t *vid_fullscreen; cvar_t *vid_system_gamma; qboolean vid_gamma_avail; extern viddef_t vid; // global video state -unsigned short d_8to16table[256]; int modestate; // FIXME: just to avoid cross-comp. // errors - remove later diff --git a/libs/video/targets/vid_sunx.c b/libs/video/targets/vid_sunx.c index da4d02712..6bf9d5267 100644 --- a/libs/video/targets/vid_sunx.c +++ b/libs/video/targets/vid_sunx.c @@ -102,7 +102,6 @@ typedef struct { } keymap_t; viddef_t vid; // global video state -unsigned short d_8to16table[256]; int num_shades = 32; diff --git a/libs/video/targets/vid_sunxil.c b/libs/video/targets/vid_sunxil.c index 887e867c6..a85439517 100644 --- a/libs/video/targets/vid_sunxil.c +++ b/libs/video/targets/vid_sunxil.c @@ -104,7 +104,6 @@ typedef struct { } keymap_t; viddef_t vid; // global video state -unsigned short d_8to16table[256]; int num_shades = 32; diff --git a/libs/video/targets/vid_svgalib.c b/libs/video/targets/vid_svgalib.c index c7011e5b1..7f5965e58 100644 --- a/libs/video/targets/vid_svgalib.c +++ b/libs/video/targets/vid_svgalib.c @@ -60,8 +60,6 @@ void VGA_UpdatePlanarScreen (void *srcbuffer); cvar_t *vid_system_gamma; qboolean vid_gamma_avail; -unsigned short d_8to16table[256]; - static int num_modes, current_mode; static vga_modeinfo *modes; diff --git a/libs/video/targets/vid_x11.c b/libs/video/targets/vid_x11.c index 457c2b784..4383602df 100644 --- a/libs/video/targets/vid_x11.c +++ b/libs/video/targets/vid_x11.c @@ -80,7 +80,6 @@ #include "dga_check.h" extern viddef_t vid; // global video state -unsigned short d_8to16table[256]; static Colormap x_cmap; static GC x_gc;