qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-02-06 07:41:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Raorn's SDL_GL_GetProc support. Makes -sgl targets work again, hopefully on windows as well as linux.

Browse source 
Now just need to get key repeat, focus handling and sound blocking on focus loss working like x11 input system does, and sdl support will be in pretty good shape. And clean out all the stupid #ifdefs...
This commit is contained in:
Ragnvald Maartmann-Moe IV 2002-08-16 07:53:11 +00:00
parent f068b47c0c
commit 3b65cbc35d
1 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
libs/video/targets/vid_sgl.c
View file

@ -53,10 +53,10 @@ static const char rcsid[] =
#include "QF/GL/funcs.h" #include "QF/GL/funcs.h"
#include "compat.h" #include "compat.h"
#include "r_cvar.h"
#include "sbar.h" #include "sbar.h"
#ifdef WIN32 #ifdef WIN32 // FIXME: evil hack to get full DirectSound support with SDL
/* FIXME: this is evil hack to get full DirectSound support with SDL */
# include <windows.h> # include <windows.h>
# include <SDL_syswm.h> # include <SDL_syswm.h>
HWND mainwindow; HWND mainwindow;
@ -70,25 +70,27 @@ int modestate;
static SDL_Surface *screen = NULL; static SDL_Surface *screen = NULL;
void * (* glGetProcAddress) (const char *symbol) = NULL;
void * (* getProcAddress) (void *, const char *);
// the following is to avoid other compiler errors
#ifdef _WIN32 void *
void * (WINAPI *glGetProcAddress) (const char *symbol) = NULL; // FIXME QFGL_DummyProcAddress (void *handle, const char *symbol)
//# error "Cannot load libraries: %s was not configured with DSO support" {
FARPROC (WINAPI *getProcAddress) (HINSTANCE, LPCSTR); return NULL;
#else }
void * (* glGetProcAddress) (const char *symbol) = NULL; // FIXME
//# error "Cannot load libraries: %s was not configured with DSO support"
void * (* getProcAddress) (void *, const char *);
#endif
void * void *
QFGL_LoadLibrary (void) QFGL_LoadLibrary (void)
{ {
return 0; if (SDL_GL_LoadLibrary (gl_driver->string) != 0)
} Sys_Error ("Couldn't load OpenGL library %s!", gl_driver->string);
//#endif
getProcAddress = QFGL_DummyProcAddress;
glGetProcAddress = SDL_GL_GetProcAddress;
return NULL;
}
void void
VID_SDL_GammaCheck (void) VID_SDL_GammaCheck (void)
@ -151,9 +153,11 @@ VID_Init (unsigned char *palette)
Uint32 flags = SDL_OPENGL; Uint32 flags = SDL_OPENGL;
int i; int i;
GL_Pre_Init (); // Initialize the SDL library
if (SDL_Init (SDL_INIT_VIDEO) < 0)
Sys_Error ("Couldn't initialize SDL: %s", SDL_GetError ());
// SDL_SysWMinfo info; GL_Pre_Init ();
VID_GetWindowSize (640, 480); VID_GetWindowSize (640, 480);
@ -182,15 +186,11 @@ VID_Init (unsigned char *palette)
// than 200 px // than 200 px
vid.conheight = max (atoi (com_argv[i + 1]), 200); vid.conheight = max (atoi (com_argv[i + 1]), 200);
// Initialize the SDL library
if (SDL_Init (SDL_INIT_VIDEO) < 0)
Sys_Error ("Couldn't initialize SDL: %s", SDL_GetError ());
// Check if we want fullscreen // Check if we want fullscreen
if (vid_fullscreen->value) { if (vid_fullscreen->value) {
flags |= SDL_FULLSCREEN; flags |= SDL_FULLSCREEN;
// Don't annoy Mesa/3dfx folks
#ifndef WIN32 #ifndef WIN32 // Don't annoy Mesa/3dfx folks
// FIXME: Maybe this could be put in a different spot, but I don't // FIXME: Maybe this could be put in a different spot, but I don't
// know where. Anyway, it's to work around a 3Dfx Glide bug. // know where. Anyway, it's to work around a 3Dfx Glide bug.
SDL_ShowCursor (0); SDL_ShowCursor (0);