X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=vid_3dfxsvga.c;h=a07b8f317888ae6be9ba6b9577a14cd5e7d85d63;hp=7be5d671f19f2c3026c1a429fa2cbcebc54cca18;hb=b2f7fe6f3ec6934b89161592c5df77b3932f2698;hpb=069960ea1e54b56f7dbd65f09ec3fb37a761f0d5 diff --git a/vid_3dfxsvga.c b/vid_3dfxsvga.c index 7be5d671..a07b8f31 100644 --- a/vid_3dfxsvga.c +++ b/vid_3dfxsvga.c @@ -45,15 +45,6 @@ #include #include -#define WARP_WIDTH 320 -#define WARP_HEIGHT 200 - - -//unsigned short d_8to16table[256]; -unsigned d_8to24table[256]; -unsigned char d_15to8table[65536]; - -cvar_t vid_mode = {"vid_mode","0",false}; viddef_t vid; // global video state @@ -65,34 +56,7 @@ static int scr_width, scr_height; int VID_options_items = 0; /*-----------------------------------------------------------------------*/ - -int texture_extension_number = 1; - -float gldepthmin, gldepthmax; - -const char *gl_vendor; -const char *gl_renderer; -const char *gl_version; -const char *gl_extensions; - -void (*qglColorTableEXT) (int, int, int, int, int, const void*); -void (*qgl3DfxSetPaletteEXT) (GLuint *); -void (*qglMTexCoord2f) (GLenum, GLfloat, GLfloat); -void (*qglSelectTexture) (GLenum); - -int gl_mtex_enum = 0; - -// LordHavoc: in GLX these are never set, simply provided to make the rest of the code work -qboolean is8bit = false; -qboolean isPermedia = false; -qboolean isATI = false; -qboolean isG200 = false; -qboolean isRagePro = false; -qboolean gl_mtexable = false; -qboolean gl_arrays = false; - -/*-----------------------------------------------------------------------*/ -void D_BeginDirectRect (int x, int y, byte *pbitmap, int width, int height) +void D_BeginDirectRect (int x, int y, qbyte *pbitmap, int width, int height) { } @@ -106,6 +70,8 @@ void VID_Shutdown(void) return; fxMesaDestroyContext(fc); + + GL_CloseLibrary(); } void signal_handler(int sig) @@ -113,7 +79,6 @@ void signal_handler(int sig) printf("Received signal %d, exiting...\n", sig); Host_Shutdown(); abort(); - //Sys_Quit(); exit(0); } @@ -124,94 +89,15 @@ 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); } -/* - CheckMultiTextureExtensions - - Check for ARB, SGIS, or EXT multitexture support -*/ -void -CheckMultiTextureExtensions ( void ) -{ - Con_Printf ("Checking for multitexture... "); - if (COM_CheckParm ("-nomtex")) - { - Con_Printf ("disabled\n"); - return; - } - dlhand = dlopen (NULL, RTLD_LAZY); - if (dlhand == NULL) - { - Con_Printf ("unable to check\n"); - return; - } - if (strstr(gl_extensions, "GL_ARB_multitexture ")) - { - Con_Printf ("GL_ARB_multitexture\n"); - qglMTexCoord2f = (void *)dlsym(dlhand, "glMultiTexCoord2fARB"); - qglSelectTexture = (void *)dlsym(dlhand, "glActiveTextureARB"); - gl_mtex_enum = GL_TEXTURE0_ARB; - gl_mtexable = true; - } else if (strstr(gl_extensions, "GL_SGIS_multitexture ")) - { - Con_Printf ("GL_SGIS_multitexture\n"); - qglMTexCoord2f = (void *)dlsym(dlhand, "glMTexCoord2fSGIS"); - qglSelectTexture = (void *)dlsym(dlhand, "glSelectTextureSGIS"); - gl_mtex_enum = TEXTURE0_SGIS; - gl_mtexable = true; - } else { - Con_Printf ("none found\n"); - } - dlclose(dlhand); - dlhand = NULL; -} - - typedef void (GLAPIENTRY *gl3DfxSetDitherModeEXT_FUNC) (GrDitherMode_t mode); -/* -=============== -GL_Init -=============== -*/ -void GL_Init (void) +void VID_SetupDithering(void) { - gl_vendor = glGetString (GL_VENDOR); - Con_Printf ("GL_VENDOR: %s\n", gl_vendor); - gl_renderer = glGetString (GL_RENDERER); - Con_Printf ("GL_RENDERER: %s\n", gl_renderer); - - gl_version = glGetString (GL_VERSION); - Con_Printf ("GL_VERSION: %s\n", gl_version); - gl_extensions = glGetString (GL_EXTENSIONS); - Con_Printf ("GL_EXTENSIONS: %s\n", gl_extensions); - - CheckMultiTextureExtensions (); - - glCullFace(GL_FRONT); - glEnable(GL_TEXTURE_2D); - - glEnable(GL_ALPHA_TEST); - glAlphaFunc(GL_GREATER, 0.666); - - glPolygonMode (GL_FRONT_AND_BACK, GL_FILL); - glShadeModel (GL_FLAT); - - glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); - glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); - glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT); - glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT); - - glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - - glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); - Con_Printf ("Dithering: "); dlhand = dlopen (NULL, RTLD_LAZY); @@ -233,7 +119,7 @@ void GL_Init (void) dither_select(GR_DITHER_4x4); Con_Printf ("4x4.\n"); } else { - glDisable(GL_DITHER); + qglDisable(GL_DITHER); Con_Printf ("disabled.\n"); } } @@ -243,29 +129,23 @@ void GL_Init (void) /* ================= -GL_BeginRendering - +VID_GetWindowSize ================= */ -void GL_BeginRendering (int *x, int *y, int *width, int *height) +void VID_GetWindowSize (int *x, int *y, int *width, int *height) { *x = *y = 0; *width = scr_width; *height = scr_height; - -// if (!wglMakeCurrent( maindc, baseRC )) -// Sys_Error ("wglMakeCurrent failed"); - -// glViewport (*x, *y, *width, *height); } - -void GL_EndRendering (void) +void VID_Finish (void) { - if (!r_render.value) - return; - glFlush(); - fxMesaSwapBuffers(); + if (r_render.integer) + { + qglFinish(); + fxMesaSwapBuffers(); + } } static int resolutions[][3]={ @@ -339,89 +219,19 @@ findres(int *width, int *height) return GR_RESOLUTION_640x480; } -qboolean VID_Is8bit(void) +int VID_SetGamma(float prescale, float gamma, float scale, float base) { - return is8bit; -} - -typedef void (GLAPIENTRY *glColorTableEXT_FUNC) (GLenum, GLenum, GLsizei, - GLenum, GLenum, const GLvoid *); -typedef void (GLAPIENTRY *gl3DfxSetPaletteEXT_FUNC) (GLuint *pal); - -void VID_Init8bitPalette() -{ - // Check for 8bit Extensions and initialize them. - int i; - - dlhand = dlopen (NULL, RTLD_LAZY); - - Con_SafePrintf ("8-bit GL extensions: "); - - if (dlhand == NULL) { - Con_SafePrintf ("unable to check.\n"); - return; - } - - if (COM_CheckParm("-no8bit")) { - Con_SafePrintf("disabled.\n"); - return; - } - - if (strstr(gl_extensions, "3DFX_set_global_palette") && (qgl3DfxSetPaletteEXT = dlsym(dlhand, "gl3DfxSetPaletteEXT")) != NULL) - { - GLubyte table[256][4]; - char *oldpal; - - Con_SafePrintf("3DFX_set_global_palette.\n"); - glEnable( GL_SHARED_TEXTURE_PALETTE_EXT ); - oldpal = (char *) d_8to24table; //d_8to24table3dfx; - for (i=0;i<256;i++) - { - table[i][2] = *oldpal++; - table[i][1] = *oldpal++; - table[i][0] = *oldpal++; - table[i][3] = 255; - oldpal++; - } - qgl3DfxSetPaletteEXT((GLuint *)table); - is8bit = true; - } else if (strstr(gl_extensions, "GL_EXT_shared_texture_palette")) { - char thePalette[256*3]; - char *oldPalette, *newPalette; - glColorTableEXT_FUNC load_texture = NULL; - - Con_SafePrintf("GL_EXT_shared.\n"); - load_texture = (void *) dlsym(dlhand, "glColorTableEXT"); - - glEnable( GL_SHARED_TEXTURE_PALETTE_EXT ); - oldPalette = (char *) d_8to24table; //d_8to24table3dfx; - newPalette = thePalette; - for (i=0;i<256;i++) { - *newPalette++ = *oldPalette++; - *newPalette++ = *oldPalette++; - *newPalette++ = *oldPalette++; - oldPalette++; - } - load_texture(GL_SHARED_TEXTURE_PALETTE_EXT, GL_RGB, 256, GL_RGB, GL_UNSIGNED_BYTE, (void *) thePalette); - is8bit = true; - } else { - Con_SafePrintf ("not found.\n"); - } - - dlclose(dlhand); - dlhand = NULL; + return FALSE; } -extern void Check_Gamma (unsigned char *pal); -void VID_Setup15to8Palette (); - -void VID_Init(unsigned char *palette) +void VID_Init(void) { int i; GLint attribs[32]; - char gldir[MAX_OSPATH]; int width = 640, height = 480; + GL_OpenLibrary(); + // set vid parameters attribs[0] = FXMESA_DOUBLEBUFFER; attribs[1] = FXMESA_ALPHA_SIZE; @@ -467,50 +277,24 @@ void VID_Init(unsigned char *palette) vid.conheight = height; if (vid.conwidth > width) vid.conwidth = width; - vid.width = vid.conwidth; - vid.height = vid.conheight; - - vid.aspect = ((float)vid.height / (float)vid.width) * (320.0 / 240.0); InitSig(); // trap evil signals GL_Init(); - snprintf(gldir, sizeof(gldir), "%s/glquake", com_gamedir); - Sys_mkdir (gldir); - - VID_SetPalette(palette); + VID_SetupDithering(); // 3DFX specific - Check_Gamma(palette); - - // Check for 3DFX Extensions and initialize them. - VID_Init8bitPalette(); - - if (is8bit) // LordHavoc: avoid calculating 15to8 table if it won't be used - VID_Setup15to8Palette (); + vid_hidden = false; Con_SafePrintf ("Video mode %dx%d initialized.\n", width, height); - - vid.recalc_refdef = 1; // force a surface cache flush } 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_InitCvars () -{ } void VID_SetCaption (char *text) @@ -520,3 +304,4 @@ void VID_SetCaption (char *text) void VID_HandlePause (qboolean pause) { } +