diff --git a/include/QF/sys.h b/include/QF/sys.h index 4b5cd6b44..3dd38bb87 100644 --- a/include/QF/sys.h +++ b/include/QF/sys.h @@ -79,6 +79,7 @@ void Sys_TimeOfDay(date_t *date); void Sys_MaskPrintf (int mask, const char *fmt, ...) __attribute__((format(printf,2,3))); #define SYS_DEV 1 #define SYS_WARN 3 // bit 0 so developer 1 will pick it up +#define SYS_VID 5 int Sys_CheckInput (int idle, int net_socket); const char *Sys_ConsoleInput (void); diff --git a/libs/video/targets/context_x11.c b/libs/video/targets/context_x11.c index 3eefe4f9c..4a4385d46 100644 --- a/libs/video/targets/context_x11.c +++ b/libs/video/targets/context_x11.c @@ -128,7 +128,7 @@ configure_notify (XEvent *event) if (vidmode_active) X11_ForceViewPort (); #endif - Sys_MaskPrintf (SYS_DEV, + Sys_MaskPrintf (SYS_VID, "ConfigureNotify: %ld %d %ld %ld %d,%d (%d,%d) " "%d %ld %d\n", c->serial, c->send_event, c->event, c->window, c->x, c->y, @@ -140,7 +140,7 @@ qboolean X11_AddEvent (int event, void (*event_handler) (XEvent *)) { if (event >= LASTEvent) { - Sys_MaskPrintf (SYS_DEV, "event: %d, LASTEvent: %d\n", event, + Sys_MaskPrintf (SYS_VID, "event: %d, LASTEvent: %d\n", event, LASTEvent); return false; } @@ -431,7 +431,7 @@ X11_SetVidMode (int width, int height) } if (found_mode) { - Sys_MaskPrintf (SYS_DEV, "VID: Chose video mode: %dx%d\n", + Sys_MaskPrintf (SYS_VID, "VID: Chose video mode: %dx%d\n", vid.width, vid.height); XF86VidModeSwitchToMode (x_disp, x_screen, diff --git a/libs/video/targets/dga_check.c b/libs/video/targets/dga_check.c index 60e0d57b4..1625580a5 100644 --- a/libs/video/targets/dga_check.c +++ b/libs/video/targets/dga_check.c @@ -97,11 +97,11 @@ VID_CheckDGA (Display * dpy, int *maj_ver, int *min_ver, int *hasvideo) } if ((!maj_ver) || (*maj_ver != XDGA_MAJOR_VERSION)) { - Sys_MaskPrintf (SYS_DEV, "VID: Incorrect DGA version: %d.%d, \n", + Sys_MaskPrintf (SYS_VID, "VID: Incorrect DGA version: %d.%d, \n", *maj_ver, *min_ver); return false; } - Sys_MaskPrintf (SYS_DEV, "VID: DGA version: %d.%d\n", *maj_ver, *min_ver); + Sys_MaskPrintf (SYS_VID, "VID: DGA version: %d.%d\n", *maj_ver, *min_ver); if (!hasvideo) hasvideo = &dummy_video; @@ -151,12 +151,12 @@ VID_CheckVMode (Display * dpy, int *maj_ver, int *min_ver) return false; if ((!maj_ver) || (*maj_ver != XF86VIDMODE_MAJOR_VERSION)) { - Sys_MaskPrintf (SYS_DEV, "VID: Incorrect VidMode version: %d.%d\n", + Sys_MaskPrintf (SYS_VID, "VID: Incorrect VidMode version: %d.%d\n", *maj_ver, *min_ver); return false; } - Sys_MaskPrintf (SYS_DEV, "VID: VidMode version: %d.%d\n", + Sys_MaskPrintf (SYS_VID, "VID: VidMode version: %d.%d\n", *maj_ver, *min_ver); return true; #else diff --git a/libs/video/targets/in_common.c b/libs/video/targets/in_common.c index 78bde8e0c..5d87363b3 100644 --- a/libs/video/targets/in_common.c +++ b/libs/video/targets/in_common.c @@ -135,7 +135,7 @@ IN_Shutdown (void) { JOY_Shutdown (); - Sys_MaskPrintf (SYS_DEV, "IN_Shutdown\n"); + Sys_MaskPrintf (SYS_VID, "IN_Shutdown\n"); IN_LL_Shutdown (); IE_Shutdown (); diff --git a/libs/video/targets/in_svgalib.c b/libs/video/targets/in_svgalib.c index a77c76650..430dff57c 100644 --- a/libs/video/targets/in_svgalib.c +++ b/libs/video/targets/in_svgalib.c @@ -115,7 +115,7 @@ keyhandler (int scancode, int state) default: break; } - //Sys_MaskPrintf (SYS_DEV, "%d %02x %02lx %04x %c\n", sc, press, shifts, + //Sys_MaskPrintf (SYS_VID, "%d %02x %02lx %04x %c\n", sc, press, shifts, // key, ascii > 32 && ascii < 127 ? ascii : '#'); Key_Event (key, ascii, press); } @@ -386,14 +386,14 @@ IN_InitMouse (void) mouserate = atoi (com_argv[COM_CheckParm ("-mrate") + 1]); } #if 0 - Sys_MaskPrintf (SYS_DEV, "Mouse: dev=%s,type=%s,speed=%d\n", + Sys_MaskPrintf (SYS_VID, "Mouse: dev=%s,type=%s,speed=%d\n", mousedev, mice[mtype].name, mouserate); #endif //FIXME: vga_init() opens the mouse automoatically // closing it to ensure its opened how we want it mouse_close(); if (mouse_init ((char *)mousedev, mtype, mouserate)) { - Sys_MaskPrintf (SYS_DEV, + Sys_MaskPrintf (SYS_VID, "No mouse found. Check your libvga.conf mouse settings" " and that the mouse\n" "device has appropriate permission settings.\n"); @@ -407,7 +407,7 @@ IN_InitMouse (void) void IN_LL_Shutdown (void) { - Sys_MaskPrintf (SYS_DEV, "IN_LL_Shutdown\n"); + Sys_MaskPrintf (SYS_VID, "IN_LL_Shutdown\n"); if (UseMouse) mouse_close (); diff --git a/libs/video/targets/in_win.c b/libs/video/targets/in_win.c index c4ecfdc6b..3d777a18f 100644 --- a/libs/video/targets/in_win.c +++ b/libs/video/targets/in_win.c @@ -680,7 +680,7 @@ MapKey (unsigned int keycode, int press, int *k, int *u) break; } - Sys_MaskPrintf (SYS_DEV, "%08x %d %02x %02lx %04x %c\n", + Sys_MaskPrintf (SYS_VID, "%08x %d %02x %02lx %04x %c\n", keycode, press, scan, shifts, key, uc > 32 && uc < 127 ? uc : '#'); *k = key; diff --git a/libs/video/targets/in_x11.c b/libs/video/targets/in_x11.c index 19c680c4d..95aa84e2f 100644 --- a/libs/video/targets/in_x11.c +++ b/libs/video/targets/in_x11.c @@ -712,7 +712,7 @@ IN_LL_ProcessEvents (void) void IN_LL_Shutdown (void) { - Sys_MaskPrintf (SYS_DEV, "IN_LL_Shutdown\n"); + Sys_MaskPrintf (SYS_VID, "IN_LL_Shutdown\n"); in_mouse_avail = 0; if (x_disp) { XAutoRepeatOn (x_disp); diff --git a/libs/video/targets/joy.c b/libs/video/targets/joy.c index 3bf09bf73..c4804a6bc 100644 --- a/libs/video/targets/joy.c +++ b/libs/video/targets/joy.c @@ -155,7 +155,7 @@ JOY_Init (void) int i; if (JOY_Open () == -1) { - Sys_MaskPrintf (SYS_DEV, "JOY: Joystick not found.\n"); + Sys_MaskPrintf (SYS_VID, "JOY: Joystick not found.\n"); joy_found = false; joy_active = false; return; @@ -164,12 +164,12 @@ JOY_Init (void) joy_found = true; if (!joy_enable->int_val) { - Sys_MaskPrintf (SYS_DEV, "JOY: Joystick found, but not enabled.\n"); + Sys_MaskPrintf (SYS_VID, "JOY: Joystick found, but not enabled.\n"); joy_active = false; JOY_Close (); } - Sys_MaskPrintf (SYS_DEV, "JOY: Joystick found and activated.\n"); + Sys_MaskPrintf (SYS_VID, "JOY: Joystick found and activated.\n"); // Initialize joystick if found and enabled for (i = 0; i < JOY_MAX_BUTTONS; i++) { diff --git a/libs/video/targets/joy_linux.c b/libs/video/targets/joy_linux.c index fff99a3a2..1a37a7c68 100644 --- a/libs/video/targets/joy_linux.c +++ b/libs/video/targets/joy_linux.c @@ -99,8 +99,8 @@ JOY_Close (void) i = close (joy_handle); if (i) { - Sys_MaskPrintf (SYS_DEV, "JOY: Failed to close joystick device!\n"); + Sys_MaskPrintf (SYS_VID, "JOY: Failed to close joystick device!\n"); } else { - Sys_MaskPrintf (SYS_DEV, "JOY_Shutdown\n"); + Sys_MaskPrintf (SYS_VID, "JOY_Shutdown\n"); } } diff --git a/libs/video/targets/qfgl_ext.c b/libs/video/targets/qfgl_ext.c index bbc042095..513ce4783 100644 --- a/libs/video/targets/qfgl_ext.c +++ b/libs/video/targets/qfgl_ext.c @@ -71,14 +71,14 @@ QFGL_ProcAddress (void *handle, const char *name, qboolean crit) { void *glfunc = NULL; - Sys_MaskPrintf (SYS_DEV, "DEBUG: Finding symbol %s ... ", name); + Sys_MaskPrintf (SYS_VID, "DEBUG: Finding symbol %s ... ", name); glfunc = QFGL_GetProcAddress (handle, name); if (glfunc) { - Sys_MaskPrintf (SYS_DEV, "found [%p]\n", glfunc); + Sys_MaskPrintf (SYS_VID, "found [%p]\n", glfunc); return glfunc; } - Sys_MaskPrintf (SYS_DEV, "not found\n"); + Sys_MaskPrintf (SYS_VID, "not found\n"); if (crit) { if (strncmp ("fxMesa", name, 6) == 0) { diff --git a/libs/video/targets/vid.c b/libs/video/targets/vid.c index 77f006556..96d941b37 100644 --- a/libs/video/targets/vid.c +++ b/libs/video/targets/vid.c @@ -203,13 +203,13 @@ VID_UpdateGamma (cvar_t *vid_gamma) vid.recalc_refdef = 1; // force a surface cache flush if (vid_gamma_avail && vid_system_gamma->int_val) { // Have system, use it - Sys_MaskPrintf (SYS_DEV, "Setting hardware gamma to %g\n", gamma); + Sys_MaskPrintf (SYS_VID, "Setting hardware gamma to %g\n", gamma); VID_BuildGammaTable (1.0); // hardware gamma wants a linear palette VID_SetGamma (gamma); memcpy (vid.palette, vid.basepal, 256 * 3); } else { // We have to hack the palette int i; - Sys_MaskPrintf (SYS_DEV, "Setting software gamma to %g\n", gamma); + Sys_MaskPrintf (SYS_VID, "Setting software gamma to %g\n", gamma); VID_BuildGammaTable (gamma); for (i = 0; i < 256 * 3; i++) vid.palette[i] = gammatable[vid.basepal[i]]; diff --git a/libs/video/targets/vid_3dfxsvga.c b/libs/video/targets/vid_3dfxsvga.c index eacf7ab22..833faee42 100644 --- a/libs/video/targets/vid_3dfxsvga.c +++ b/libs/video/targets/vid_3dfxsvga.c @@ -176,20 +176,20 @@ GL_Init (void) if (!(dither_select = QFGL_ExtensionAddress ("gl3DfxSetDitherModeEXT"))) return; - Sys_MaskPrintf (SYS_DEV, "Dithering: "); + Sys_MaskPrintf (SYS_VID, "Dithering: "); if ((p = COM_CheckParm ("-dither")) && p < com_argc) { if (strequal (com_argv[p+1], "2x2")) { dither_select (GR_DITHER_2x2); - Sys_MaskPrintf (SYS_DEV, "2x2.\n"); + Sys_MaskPrintf (SYS_VID, "2x2.\n"); } if (strequal (com_argv[p+1], "4x4")) { dither_select (GR_DITHER_4x4); - Sys_MaskPrintf (SYS_DEV, "4x4.\n"); + Sys_MaskPrintf (SYS_VID, "4x4.\n"); } } else { qfglDisable (GL_DITHER); - Sys_MaskPrintf (SYS_DEV, "disabled.\n"); + Sys_MaskPrintf (SYS_VID, "disabled.\n"); } } @@ -326,7 +326,7 @@ VID_Init (unsigned char *palette) vid.initialized = true; - Sys_MaskPrintf (SYS_DEV, "Video mode %dx%d initialized.\n", + Sys_MaskPrintf (SYS_VID, "Video mode %dx%d initialized.\n", vid.width, vid.height); vid.recalc_refdef = 1; // force a surface cache flush diff --git a/libs/video/targets/vid_common_gl.c b/libs/video/targets/vid_common_gl.c index edb028bc1..53ef36dca 100644 --- a/libs/video/targets/vid_common_gl.c +++ b/libs/video/targets/vid_common_gl.c @@ -197,7 +197,7 @@ gl_multitexture_f (cvar_t *var) qfglDisable (GL_TEXTURE_2D); } else { gl_mtex_fullbright = false; - Sys_MaskPrintf (SYS_DEV, + Sys_MaskPrintf (SYS_VID, "Not enough TMUs for BSP fullbrights.\n"); } } @@ -248,7 +248,7 @@ gl_anisotropy_f (cvar_t * var) } else { aniso = 1.0; if (var) - Sys_MaskPrintf (SYS_DEV, + Sys_MaskPrintf (SYS_VID, "Anisotropy (GL_EXT_texture_filter_anisotropic) " "is not supported by your hardware and/or " "drivers.\n"); @@ -267,7 +267,7 @@ gl_tessellate_f (cvar_t * var) } else { tess = 0; if (var) - Sys_MaskPrintf (SYS_DEV, + Sys_MaskPrintf (SYS_VID, "TruForm (GL_ATI_pn_triangles) is not supported " "by your hardware and/or drivers.\n"); } @@ -338,14 +338,14 @@ CheckGLVersionString (void) } else { Sys_Error ("Malformed OpenGL version string!"); } - Sys_MaskPrintf (SYS_DEV, "GL_VERSION: %s\n", gl_version); + Sys_MaskPrintf (SYS_VID, "GL_VERSION: %s\n", gl_version); gl_vendor = (char *) qfglGetString (GL_VENDOR); - Sys_MaskPrintf (SYS_DEV, "GL_VENDOR: %s\n", gl_vendor); + Sys_MaskPrintf (SYS_VID, "GL_VENDOR: %s\n", gl_vendor); gl_renderer = (char *) qfglGetString (GL_RENDERER); - Sys_MaskPrintf (SYS_DEV, "GL_RENDERER: %s\n", gl_renderer); + Sys_MaskPrintf (SYS_VID, "GL_RENDERER: %s\n", gl_renderer); gl_extensions = (char *) qfglGetString (GL_EXTENSIONS); - Sys_MaskPrintf (SYS_DEV, "GL_EXTENSIONS: %s\n", gl_extensions); + Sys_MaskPrintf (SYS_VID, "GL_EXTENSIONS: %s\n", gl_extensions); if (strstr (gl_renderer, "Mesa DRI Mach64")) gl_feature_mach64 = true; @@ -380,15 +380,15 @@ CheckCombineExtensions (void) { if (gl_major >= 1 && gl_minor >= 3) { gl_combine_capable = true; - Sys_MaskPrintf (SYS_DEV, "COMBINE active, multitextured doublebright " + Sys_MaskPrintf (SYS_VID, "COMBINE active, multitextured doublebright " "enabled.\n"); } else if (QFGL_ExtensionPresent ("GL_ARB_texture_env_combine")) { gl_combine_capable = true; - Sys_MaskPrintf (SYS_DEV, "COMBINE_ARB active, multitextured " + Sys_MaskPrintf (SYS_VID, "COMBINE_ARB active, multitextured " "doublebright enabled.\n"); } else { gl_combine_capable = false; - Sys_MaskPrintf (SYS_DEV, "GL_ARB_texture_env_combine not found. " + Sys_MaskPrintf (SYS_VID, "GL_ARB_texture_env_combine not found. " "gl_doublebright will have no effect with " "gl_multitexture on.\n"); } @@ -402,15 +402,15 @@ CheckCombineExtensions (void) static void CheckMultiTextureExtensions (void) { - Sys_MaskPrintf (SYS_DEV, "Checking for multitexture: "); + Sys_MaskPrintf (SYS_VID, "Checking for multitexture: "); if (COM_CheckParm ("-nomtex")) { - Sys_MaskPrintf (SYS_DEV, "disabled.\n"); + Sys_MaskPrintf (SYS_VID, "disabled.\n"); return; } if (gl_major >= 1 && gl_minor >= 3) { qfglGetIntegerv (GL_MAX_TEXTURE_UNITS, &gl_mtex_tmus); if (gl_mtex_tmus >= 2) { - Sys_MaskPrintf (SYS_DEV, "enabled, %d TMUs.\n", gl_mtex_tmus); + Sys_MaskPrintf (SYS_VID, "enabled, %d TMUs.\n", gl_mtex_tmus); qglMultiTexCoord2f = QFGL_ExtensionAddress ("glMultiTexCoord2f"); qglMultiTexCoord2fv = @@ -420,16 +420,16 @@ CheckMultiTextureExtensions (void) if (qglMultiTexCoord2f && gl_mtex_enum) gl_mtex_capable = true; else - Sys_MaskPrintf (SYS_DEV, "Multitexture disabled, could not " + Sys_MaskPrintf (SYS_VID, "Multitexture disabled, could not " "find required functions\n"); } else { - Sys_MaskPrintf (SYS_DEV, + Sys_MaskPrintf (SYS_VID, "Multitexture disabled, not enough TMUs.\n"); } } else if (QFGL_ExtensionPresent ("GL_ARB_multitexture")) { qfglGetIntegerv (GL_MAX_TEXTURE_UNITS_ARB, &gl_mtex_tmus); if (gl_mtex_tmus >= 2) { - Sys_MaskPrintf (SYS_DEV, "enabled, %d TMUs.\n", gl_mtex_tmus); + Sys_MaskPrintf (SYS_VID, "enabled, %d TMUs.\n", gl_mtex_tmus); qglMultiTexCoord2f = QFGL_ExtensionAddress ("glMultiTexCoord2fARB"); qglMultiTexCoord2fv = @@ -439,14 +439,14 @@ CheckMultiTextureExtensions (void) if (qglMultiTexCoord2f && gl_mtex_enum) gl_mtex_capable = true; else - Sys_MaskPrintf (SYS_DEV, "Multitexture disabled, could not " + Sys_MaskPrintf (SYS_VID, "Multitexture disabled, could not " "find required functions\n"); } else { - Sys_MaskPrintf (SYS_DEV, + Sys_MaskPrintf (SYS_VID, "Multitexture disabled, not enough TMUs.\n"); } } else { - Sys_MaskPrintf (SYS_DEV, "not found.\n"); + Sys_MaskPrintf (SYS_VID, "not found.\n"); } } @@ -489,7 +489,7 @@ CheckLights (void) specular[4] = {0.1, 0.1, 0.1, 1.0}; qfglGetIntegerv (GL_MAX_LIGHTS, &gl_max_lights); - Sys_MaskPrintf (SYS_DEV, "Max GL Lights %d.\n", gl_max_lights); + Sys_MaskPrintf (SYS_VID, "Max GL Lights %d.\n", gl_max_lights); qfglEnable (GL_LIGHTING); qfglLightModelfv (GL_LIGHT_MODEL_AMBIENT, dark); @@ -524,7 +524,7 @@ VID_SetPalette (unsigned char *palette) QFile *f; // 8 8 8 encoding - Sys_MaskPrintf (SYS_DEV, "Converting 8to24\n"); + Sys_MaskPrintf (SYS_VID, "Converting 8to24\n"); pal = palette; table = d_8to24table; @@ -643,11 +643,11 @@ Tdfx_Init8bitPalette (void) if (!(qgl3DfxSetPaletteEXT = QFGL_ExtensionAddress ("gl3DfxSetPaletteEXT"))) { - Sys_MaskPrintf (SYS_DEV, "3DFX_set_global_palette not found.\n"); + Sys_MaskPrintf (SYS_VID, "3DFX_set_global_palette not found.\n"); return; } - Sys_MaskPrintf (SYS_DEV, "3DFX_set_global_palette.\n"); + Sys_MaskPrintf (SYS_VID, "3DFX_set_global_palette.\n"); oldpal = (char *) d_8to24table; // d_8to24table3dfx; for (i = 0; i < 256; i++) { @@ -661,7 +661,7 @@ Tdfx_Init8bitPalette (void) qgl3DfxSetPaletteEXT ((GLuint *) table); is8bit = true; } else { - Sys_MaskPrintf (SYS_DEV, "\n 3DFX_set_global_palette not found."); + Sys_MaskPrintf (SYS_VID, "\n 3DFX_set_global_palette not found."); } } @@ -686,11 +686,11 @@ Shared_Init8bitPalette (void) if (QFGL_ExtensionPresent ("GL_EXT_shared_texture_palette")) { if (!(qglColorTableEXT = QFGL_ExtensionAddress ("glColorTableEXT"))) { - Sys_MaskPrintf (SYS_DEV, "glColorTableEXT not found.\n"); + Sys_MaskPrintf (SYS_VID, "glColorTableEXT not found.\n"); return; } - Sys_MaskPrintf (SYS_DEV, "GL_EXT_shared_texture_palette\n"); + Sys_MaskPrintf (SYS_VID, "GL_EXT_shared_texture_palette\n"); qfglEnable (GL_SHARED_TEXTURE_PALETTE_EXT); oldPalette = (GLubyte *) d_8to24table; // d_8to24table3dfx; @@ -705,7 +705,7 @@ Shared_Init8bitPalette (void) GL_UNSIGNED_BYTE, (GLvoid *) thePalette); is8bit = true; } else { - Sys_MaskPrintf (SYS_DEV, + Sys_MaskPrintf (SYS_VID, "\n GL_EXT_shared_texture_palette not found."); } } @@ -713,14 +713,14 @@ Shared_Init8bitPalette (void) void VID_Init8bitPalette (void) { - Sys_MaskPrintf (SYS_DEV, "Checking for 8-bit extension: "); + Sys_MaskPrintf (SYS_VID, "Checking for 8-bit extension: "); if (vid_use8bit->int_val) { Tdfx_Init8bitPalette (); Shared_Init8bitPalette (); if (!is8bit) - Sys_MaskPrintf (SYS_DEV, "\n 8-bit extension not found.\n"); + Sys_MaskPrintf (SYS_VID, "\n 8-bit extension not found.\n"); } else { - Sys_MaskPrintf (SYS_DEV, "disabled.\n"); + Sys_MaskPrintf (SYS_VID, "disabled.\n"); } } diff --git a/libs/video/targets/vid_fbdev.c b/libs/video/targets/vid_fbdev.c index 998430792..347f48d57 100644 --- a/libs/video/targets/vid_fbdev.c +++ b/libs/video/targets/vid_fbdev.c @@ -215,7 +215,7 @@ static struct fb_var_screeninfo orig_var; void VID_Shutdown (void) { - Sys_MaskPrintf (SYS_DEV, "VID_Shutdown\n"); + Sys_MaskPrintf (SYS_VID, "VID_Shutdown\n"); if (!fbdev_inited) return; diff --git a/libs/video/targets/vid_glx.c b/libs/video/targets/vid_glx.c index f0d6ba674..6e2bceb3b 100644 --- a/libs/video/targets/vid_glx.c +++ b/libs/video/targets/vid_glx.c @@ -154,7 +154,7 @@ QFGL_LoadLibrary (void) void VID_Shutdown (void) { - Sys_MaskPrintf (SYS_DEV, "VID_Shutdown\n"); + Sys_MaskPrintf (SYS_VID, "VID_Shutdown\n"); X11_CloseDisplay (); } @@ -242,7 +242,7 @@ VID_Init (unsigned char *palette) VID_Init8bitPalette (); VID_SetPalette (vid.palette); - Sys_MaskPrintf (SYS_DEV, "Video mode %dx%d initialized.\n", + Sys_MaskPrintf (SYS_VID, "Video mode %dx%d initialized.\n", vid.width, vid.height); vid.initialized = true; diff --git a/libs/video/targets/vid_sgl.c b/libs/video/targets/vid_sgl.c index ee61abe45..c50697d40 100644 --- a/libs/video/targets/vid_sgl.c +++ b/libs/video/targets/vid_sgl.c @@ -176,7 +176,7 @@ success: VID_SetPalette (vid.palette); VID_Init8bitPalette (); // Check for 3DFX Extensions and initialize them. - Sys_MaskPrintf (SYS_DEV, "Video mode %dx%d initialized.\n", + Sys_MaskPrintf (SYS_VID, "Video mode %dx%d initialized.\n", vid.width, vid.height); vid.initialized = true; diff --git a/libs/video/targets/vid_svgalib.c b/libs/video/targets/vid_svgalib.c index 625e63f67..86e7ca673 100644 --- a/libs/video/targets/vid_svgalib.c +++ b/libs/video/targets/vid_svgalib.c @@ -245,7 +245,7 @@ get_mode (int width, int height, int depth) void VID_Shutdown (void) { - Sys_MaskPrintf (SYS_DEV, "VID_Shutdown\n"); + Sys_MaskPrintf (SYS_VID, "VID_Shutdown\n"); if (!svgalib_inited) return; diff --git a/libs/video/targets/vid_x11.c b/libs/video/targets/vid_x11.c index c4c3da603..79f57fb01 100644 --- a/libs/video/targets/vid_x11.c +++ b/libs/video/targets/vid_x11.c @@ -346,7 +346,7 @@ ResetSharedFrameBuffers (void) // attach to the shared memory segment x_shminfo[frm].shmaddr = (void *) shmat (x_shminfo[frm].shmid, 0, 0); - Sys_MaskPrintf (SYS_DEV, "VID: shared memory id=%d, addr=0x%lx\n", + Sys_MaskPrintf (SYS_VID, "VID: shared memory id=%d, addr=0x%lx\n", x_shminfo[frm].shmid, (long) x_shminfo[frm].shmaddr); x_framebuffer[frm]->data = x_shminfo[frm].shmaddr; @@ -448,11 +448,11 @@ VID_Init (unsigned char *palette) x_vis = x_visinfo->visual; if (num_visuals > 1) { - Sys_MaskPrintf (SYS_DEV, + Sys_MaskPrintf (SYS_VID, "Found more than one visual id at depth %d:\n", template.depth); for (i = 0; i < num_visuals; i++) - Sys_MaskPrintf (SYS_DEV, " -visualid %d\n", + Sys_MaskPrintf (SYS_VID, " -visualid %d\n", (int) x_visinfo[i].visualid); } else { if (num_visuals == 0) { @@ -465,20 +465,20 @@ VID_Init (unsigned char *palette) } if (verbose) { - Sys_MaskPrintf (SYS_DEV, "Using visualid %d:\n", + Sys_MaskPrintf (SYS_VID, "Using visualid %d:\n", (int) x_visinfo->visualid); - Sys_MaskPrintf (SYS_DEV, " class %d\n", x_visinfo->class); - Sys_MaskPrintf (SYS_DEV, " screen %d\n", x_visinfo->screen); - Sys_MaskPrintf (SYS_DEV, " depth %d\n", x_visinfo->depth); - Sys_MaskPrintf (SYS_DEV, " red_mask 0x%x\n", + Sys_MaskPrintf (SYS_VID, " class %d\n", x_visinfo->class); + Sys_MaskPrintf (SYS_VID, " screen %d\n", x_visinfo->screen); + Sys_MaskPrintf (SYS_VID, " depth %d\n", x_visinfo->depth); + Sys_MaskPrintf (SYS_VID, " red_mask 0x%x\n", (int) x_visinfo->red_mask); - Sys_MaskPrintf (SYS_DEV, " green_mask 0x%x\n", + Sys_MaskPrintf (SYS_VID, " green_mask 0x%x\n", (int) x_visinfo->green_mask); - Sys_MaskPrintf (SYS_DEV, " blue_mask 0x%x\n", + Sys_MaskPrintf (SYS_VID, " blue_mask 0x%x\n", (int) x_visinfo->blue_mask); - Sys_MaskPrintf (SYS_DEV, " colormap_size %d\n", + Sys_MaskPrintf (SYS_VID, " colormap_size %d\n", x_visinfo->colormap_size); - Sys_MaskPrintf (SYS_DEV, " bits_per_rgb %d\n", + Sys_MaskPrintf (SYS_VID, " bits_per_rgb %d\n", x_visinfo->bits_per_rgb); } @@ -583,7 +583,7 @@ VID_SetPalette (unsigned char *palette) void VID_Shutdown (void) { - Sys_MaskPrintf (SYS_DEV, "VID_Shutdown\n"); + Sys_MaskPrintf (SYS_VID, "VID_Shutdown\n"); X11_CloseDisplay (); }