X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=vid_3dfxsvga.c;h=a07b8f317888ae6be9ba6b9577a14cd5e7d85d63;hp=00a0593b7be3478410b773c9d61fe91289ddf358;hb=b2f7fe6f3ec6934b89161592c5df77b3932f2698;hpb=069527b0cff9d91784bba159329e01b0b94df752 diff --git a/vid_3dfxsvga.c b/vid_3dfxsvga.c index 00a0593b..a07b8f31 100644 --- a/vid_3dfxsvga.c +++ b/vid_3dfxsvga.c @@ -55,13 +55,6 @@ static int scr_width, scr_height; int VID_options_items = 0; -/*-----------------------------------------------------------------------*/ - -const char *gl_vendor; -const char *gl_renderer; -const char *gl_version; -const char *gl_extensions; - /*-----------------------------------------------------------------------*/ void D_BeginDirectRect (int x, int y, qbyte *pbitmap, int width, int height) { @@ -77,6 +70,8 @@ void VID_Shutdown(void) return; fxMesaDestroyContext(fc); + + GL_CloseLibrary(); } void signal_handler(int sig) @@ -84,7 +79,6 @@ void signal_handler(int sig) printf("Received signal %d, exiting...\n", sig); Host_Shutdown(); abort(); - //Sys_Quit(); exit(0); } @@ -95,9 +89,7 @@ void InitSig(void) signal(SIGQUIT, signal_handler); signal(SIGILL, signal_handler); signal(SIGTRAP, signal_handler); -// signal(SIGIOT, signal_handler); signal(SIGBUS, signal_handler); -// signal(SIGFPE, signal_handler); signal(SIGSEGV, signal_handler); signal(SIGTERM, signal_handler); } @@ -127,7 +119,7 @@ void VID_SetupDithering(void) dither_select(GR_DITHER_4x4); Con_Printf ("4x4.\n"); } else { - glDisable(GL_DITHER); + qglDisable(GL_DITHER); Con_Printf ("disabled.\n"); } } @@ -151,7 +143,7 @@ void VID_Finish (void) { if (r_render.integer) { - glFinish(); + qglFinish(); fxMesaSwapBuffers(); } } @@ -238,6 +230,8 @@ void VID_Init(void) GLint attribs[32]; int width = 640, height = 480; + GL_OpenLibrary(); + // set vid parameters attribs[0] = FXMESA_DOUBLEBUFFER; attribs[1] = FXMESA_ALPHA_SIZE; @@ -290,25 +284,17 @@ void VID_Init(void) VID_SetupDithering(); // 3DFX specific - Con_SafePrintf ("Video mode %dx%d initialized.\n", width, height); + vid_hidden = false; -// vid.recalc_refdef = 1; // force a surface cache flush + Con_SafePrintf ("Video mode %dx%d initialized.\n", width, height); } void VID_ExtraOptionDraw(unsigned int options_draw_cursor) { -/* Port specific Options menu entrys */ } void VID_ExtraOptionCmd(int option_cursor) { -/* - switch(option_cursor) - { - case 12: // Always start with 12 - break; - } -*/ } void VID_SetCaption (char *text) @@ -318,3 +304,4 @@ void VID_SetCaption (char *text) void VID_HandlePause (qboolean pause) { } +