Mercurial > sdl-ios-xcode

diff src/video/ataricommon/SDL_atarigl.c @ 1361:19418e4422cb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
New configure-based build system. Still work in progress, but much improved
author Sam Lantinga <slouken@libsdl.org>
date Thu, 16 Feb 2006 10:11:48 +0000
parents c71e05b4dc2e
children c0a74f199ecf
line wrap: on
line diff
--- a/src/video/ataricommon/SDL_atarigl.c	Fri Feb 10 07:29:08 2006 +0000
+++ b/src/video/ataricommon/SDL_atarigl.c	Thu Feb 16 10:11:48 2006 +0000
@@ -24,7 +24,7 @@
 
 /*--- Includes ---*/
 
-#ifdef HAVE_OPENGL
+#if SDL_VIDEO_OPENGL
 #include <GL/osmesa.h>
 #endif
 
@@ -33,7 +33,7 @@
 #include "SDL_endian.h"
 #include "SDL_video.h"
 #include "SDL_atarigl_c.h"
-#ifdef ENABLE_OSMESA_SHARED
+#if SDL_VIDEO_OPENGL_OSMESA_DYNAMIC
 #include "SDL_loadso.h"
 #endif
 
@@ -49,7 +49,7 @@
 
 static void SDL_AtariGL_UnloadLibrary(_THIS);
 
-#ifdef HAVE_OPENGL
+#if SDL_VIDEO_OPENGL
 static void CopyShadowNull(_THIS, SDL_Surface *surface);
 static void CopyShadowDirect(_THIS, SDL_Surface *surface);
 static void CopyShadowRGBTo555(_THIS, SDL_Surface *surface);
@@ -76,7 +76,7 @@
 
 int SDL_AtariGL_Init(_THIS, SDL_Surface *current)
 {
-#ifdef HAVE_OPENGL
+#if SDL_VIDEO_OPENGL
 	if (gl_oldmesa) {
 		gl_active = InitOld(this, current);		
 	} else {
@@ -89,7 +89,7 @@
 
 void SDL_AtariGL_Quit(_THIS, SDL_bool unload)
 {
-#ifdef HAVE_OPENGL
+#if SDL_VIDEO_OPENGL
 	if (gl_oldmesa) {
 		/* Old mesa implementations */
 		if (this->gl_data->OSMesaDestroyLDG) {
@@ -113,15 +113,15 @@
 		SDL_AtariGL_UnloadLibrary(this);
 	}
 
-#endif /* HAVE_OPENGL */
+#endif /* SDL_VIDEO_OPENGL */
 	gl_active = 0;
 }
 
 int SDL_AtariGL_LoadLibrary(_THIS, const char *path)
 {
-#ifdef HAVE_OPENGL
+#if SDL_VIDEO_OPENGL
 
-#ifdef ENABLE_OSMESA_SHARED
+#if SDL_VIDEO_OPENGL_OSMESA_DYNAMIC
 	void *handle;
 	SDL_bool cancel_load;
 
@@ -237,7 +237,7 @@
 void *SDL_AtariGL_GetProcAddress(_THIS, const char *proc)
 {
 	void *func = NULL;
-#ifdef HAVE_OPENGL
+#if SDL_VIDEO_OPENGL
 
 	if (this->gl_config.dll_handle) {
 		func = SDL_LoadFunction(this->gl_config.dll_handle, (void *)proc);
@@ -251,7 +251,7 @@
 
 int SDL_AtariGL_GetAttribute(_THIS, SDL_GLattr attrib, int* value)
 {
-#ifdef HAVE_OPENGL
+#if SDL_VIDEO_OPENGL
 	GLenum mesa_attrib;
 	SDL_Surface *surface;
 
@@ -307,7 +307,7 @@
 
 int SDL_AtariGL_MakeCurrent(_THIS)
 {
-#ifdef HAVE_OPENGL
+#if SDL_VIDEO_OPENGL
 	SDL_Surface *surface;
 	GLenum type;
 
@@ -351,7 +351,7 @@
 
 void SDL_AtariGL_SwapBuffers(_THIS)
 {
-#ifdef HAVE_OPENGL
+#if SDL_VIDEO_OPENGL
 	if (gl_active) {
 		if (this->gl_config.dll_handle) {
 			if (this->gl_data->glFinish) {
@@ -370,7 +370,7 @@
 
 void SDL_AtariGL_InitPointers(_THIS)
 {
-#if defined(HAVE_OPENGL)
+#if SDL_VIDEO_OPENGL
 	this->gl_data->OSMesaCreateContextExt = OSMesaCreateContextExt;
 	this->gl_data->OSMesaDestroyContext = OSMesaDestroyContext;
 	this->gl_data->OSMesaMakeCurrent = OSMesaMakeCurrent;
@@ -390,7 +390,7 @@
 
 static void SDL_AtariGL_UnloadLibrary(_THIS)
 {
-#if defined(HAVE_OPENGL)
+#if SDL_VIDEO_OPENGL
 	if (this->gl_config.dll_handle) {
 		SDL_UnloadObject(this->gl_config.dll_handle);
 		this->gl_config.dll_handle = NULL;
@@ -403,7 +403,7 @@
 
 /*--- Creation of an OpenGL context using new/old functions ---*/
 
-#ifdef HAVE_OPENGL
+#if SDL_VIDEO_OPENGL
 static int InitNew(_THIS, SDL_Surface *current)
 {
 	GLenum osmesa_format;
@@ -1084,4 +1084,4 @@
 	}
 }
 
-#endif /* HAVE_OPENGL */
+#endif /* SDL_VIDEO_OPENGL */