yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2024-11-10 07:12:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

Reenable gamma via SDL. The upstream bug was fixed with SDL 1.2.15

Browse source
This commit is contained in:
Yamagi Burmeister 2012-03-30 09:11:32 +00:00
parent 5324d01e89
commit bedb5fb573
2 changed files with 29 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGELOG
View file

@ -6,6 +6,9 @@ Quake II 4.03 to 4.10
limited to 2300x2300. The default is "0". (by Richard
Allen)
- Add support for the high resolution retexturing pack.
- Reenable support for gamma via SDL, since the upstream
bug was fixed with SDL 1.2.15. Gamma via X11 can be
forced by defining X11GAMMA at compile time.
Quake II 4.02 to 4.03
- Fix wrong function call in the Quake II file system.

30
src/sdl/refresh.c
View file

@ -45,9 +45,12 @@ glwstate_t glw_state;
qboolean have_stencil = false;
char *displayname = NULL;
Display *dpy;
int screen = -1;
#ifdef X11GAMMA
Display *dpy;
XF86VidModeGamma x11_oldgamma;
#endif
/*
* Initialzes the SDL OpenGL context
@ -119,6 +122,7 @@ static void SetSDLIcon()
/*
* Sets the hardware gamma
*/
#ifdef X11GAMMA
void
UpdateHardwareGamma(void)
{
@ -136,6 +140,16 @@ UpdateHardwareGamma(void)
/* This forces X11 to update the gamma tables */
XF86VidModeGetGamma(dpy, screen, &x11_gamma);
}
#else
void
UpdateHardwareGamma(void)
{
float gamma;
gamma = (vid_gamma->value);
SDL_SetGamma(gamma, gamma, gamma);
}
#endif
/*
* Initializes the OpenGL window
@ -193,7 +207,7 @@ static qboolean GLimp_InitGraphics( qboolean fullscreen )
/* Set the icon */
SetSDLIcon();
while (1)
{
if ((surface = SDL_SetVideoMode(vid.width, vid.height, 0, flags)) == NULL)
@ -234,6 +248,7 @@ static qboolean GLimp_InitGraphics( qboolean fullscreen )
}
/* Initialize hardware gamma */
#ifdef X11GAMMA
if ( ( dpy = XOpenDisplay( displayname ) ) == NULL )
{
ri.Con_Printf(PRINT_ALL, "Unable to open display.\n");
@ -250,11 +265,16 @@ static qboolean GLimp_InitGraphics( qboolean fullscreen )
XF86VidModeGetGamma(dpy, screen, &x11_oldgamma);
ri.Con_Printf(PRINT_ALL, "Using hardware gamma.\n");
ri.Con_Printf(PRINT_ALL, "Using hardware gamma via X11.\n");
}
#else
gl_state.hwgamma = true;
vid_gamma->modified = true;
ri.Con_Printf(PRINT_ALL, "Using hardware gamma via SDL.\n");
#endif
/* Window title */
snprintf(title, sizeof(title), "Yamagi Quake II v%4.2f", VERSION);
snprintf(title, sizeof(title), "Yamagi Quake II %4.2f", VERSION);
SDL_WM_SetCaption(title, title);
/* No cursor */
@ -317,6 +337,7 @@ void GLimp_Shutdown( void )
SDL_QuitSubSystem(SDL_INIT_VIDEO);
}
#ifdef X11GAMMA
if (gl_state.hwgamma == true)
{
XF86VidModeSetGamma(dpy, screen, &x11_oldgamma);
@ -324,6 +345,7 @@ void GLimp_Shutdown( void )
/* This forces X11 to update the gamma tables */
XF86VidModeGetGamma(dpy, screen, &x11_oldgamma);
}
#endif
gl_state.hwgamma = false;
}