sdl-ios-xcode: src/video/SDL_video.c comparison

comparison src/video/SDL_video.c @ 2743:453ec0c21f6f

Rolling back changes to revision 4071 ... made some mistakes, will try merging work again.

author	Holmes Futrell <hfutrell@umail.ucsb.edu>
date	Tue, 02 Sep 2008 20:05:33 +0000
parents	22c96d28449f
children	1aede15771d0

comparison

equal deleted inserted replaced

-:b86247d21929
+:453ec0c21f6f
 #include "SDL.h"
 #include "SDL_sysvideo.h"
 #include "SDL_blit.h"
 #include "SDL_pixels_c.h"
 #include "SDL_renderer_gl.h"
-#include "SDL_renderer_gles.h"
 #include "SDL_renderer_sw.h"
 #include "../events/SDL_sysevents.h"
 #include "../events/SDL_events_c.h"
-#if SDL_VIDEO_OPENGL_ES
-#include "SDL_opengles.h"
-#endif /* SDL_VIDEO_OPENGL_ES */
 #if SDL_VIDEO_OPENGL
 #include "SDL_opengl.h"
 /* On Windows, windows.h defines CreateWindow */
 &RISCOS_bootstrap,
 #endif
 #if SDL_VIDEO_DRIVER_OS2FS
 &OS2FSLib_bootstrap,
 #endif
-#if SDL_VIDEO_DRIVER_UIKIT
+#if SDL_VIDEO_DRIVER_NDS
-	&UIKIT_bootstrap,
+&NDS_bootstrap,
 #endif
 #if SDL_VIDEO_DRIVER_DUMMY
 &DUMMY_bootstrap,
 #endif
 NULL
 _this->gl_config.accum_blue_size = 0;
 _this->gl_config.accum_alpha_size = 0;
 _this->gl_config.stereo = 0;
 _this->gl_config.multisamplebuffers = 0;
 _this->gl_config.multisamplesamples = 0;
-	_this->gl_config.retained_backing = 1; /* most systems have retained backing on the color buffers */
 _this->gl_config.accelerated = -1;  /* not known, don't set */
 /* Initialize the video subsystem */
 if (_this->VideoInit(_this) < 0) {
 SDL_VideoQuit();
 /* The software renderer is always available */
 for (i = 0; i < _this->num_displays; ++i) {
 #if SDL_VIDEO_RENDER_OGL
 SDL_AddRenderDriver(i, &GL_RenderDriver);
-#endif
-#if SDL_VIDEO_RENDER_OGL_ES
-		SDL_AddRenderDriver(i, &GL_ES_RenderDriver);
 #endif
 if (_this->displays[i].num_render_drivers > 0) {
 SDL_AddRenderDriver(i, &SW_RenderDriver);
 }
 }
 return 0;
 }
 if (index < 0) {
 const char *override = SDL_getenv("SDL_VIDEO_RENDERER");
+int n = SDL_GetNumRenderDrivers();
-		int n = SDL_GetNumRenderDrivers();
 for (index = 0; index < n; ++index) {
 SDL_RenderDriver *driver =
 &SDL_CurrentDisplay.render_drivers[index];
 if (override) {
 SDL_DestroyRenderer(windowID);
 /* Create a new renderer instance */
 window->renderer = SDL_CurrentDisplay.render_drivers[index]
 .CreateRenderer(window, flags);
 SDL_SelectRenderer(window->id);
 return 0;
 }
 SDL_SetError("SDL_CreateTextureFromSurface() passed NULL surface");
 return 0;
 }
 fmt = surface->format;
-if (format) { /* if we were passed in a format */
+if (format) {
 if (!SDL_PixelFormatEnumToMasks
 (format, &bpp, &Rmask, &Gmask, &Bmask, &Amask)) {
 SDL_SetError("Unknown pixel format");
 return 0;
 }
 } else {
 if (surface->format->Amask
 || !(surface->map->info.flags &
 (SDL_COPY_COLORKEY | SDL_COPY_MASK | SDL_COPY_BLEND))) {
-			bpp = fmt->BitsPerPixel;
+bpp = fmt->BitsPerPixel;
 Rmask = fmt->Rmask;
 Gmask = fmt->Gmask;
 Bmask = fmt->Bmask;
 Amask = fmt->Amask;
 } else {
 SDL_SetError("Unknown pixel format");
 return 0;
 }
 }
-textureID = SDL_CreateTexture(format, SDL_TEXTUREACCESS_STATIC, surface->w,
+textureID =
+SDL_CreateTexture(format, SDL_TEXTUREACCESS_STATIC, surface->w,
 surface->h);
 if (!textureID) {
 return 0;
 }
 if (dst_fmt->palette) {
 /* FIXME: Should we try to copy fmt->palette? */
 SDL_DitherColors(dst_fmt->palette->colors,
 SDL_BITSPERPIXEL(format));
 }
 }
-			dst = SDL_ConvertSurface(surface, dst_fmt, 0);
+dst = SDL_ConvertSurface(surface, dst_fmt, 0);
 if (dst) {
 SDL_UpdateTexture(textureID, NULL, dst->pixels, dst->pitch);
 SDL_FreeSurface(dst);
 }
 if (dst_fmt->palette) {
 }
 if (!dst) {
 SDL_DestroyTexture(textureID);
 return 0;
 }
-	}
+}
 if (SDL_ISPIXELFORMAT_INDEXED(format) && fmt->palette) {
 SDL_SetTexturePalette(textureID, fmt->palette->colors, 0,
 fmt->palette->ncolors);
 }
 }
 int
 SDL_RenderFill(Uint8 r, Uint8 g, Uint8 b, Uint8 a, const SDL_Rect * rect)
 {
 SDL_Renderer *renderer;
 SDL_Window *window;
 SDL_Rect real_rect;
 if (!_this) {
 }
 SDL_bool
 SDL_GL_ExtensionSupported(const char *extension)
 {
-#if SDL_VIDEO_OPENGL || SDL_VIDEO_OPENGL_ES
+#if SDL_VIDEO_OPENGL
+const GLubyte *(APIENTRY * glGetStringFunc) (GLenum);
-	const GLubyte *(APIENTRY * glGetStringFunc) (GLenum);
 const char *extensions;
 const char *start;
 const char *where, *terminator;
 /* Extension names should not have spaces. */
 }
 int
 SDL_GL_SetAttribute(SDL_GLattr attr, int value)
 {
-#if SDL_VIDEO_OPENGL || SDL_VIDEO_OPENGL_ES
+#if SDL_VIDEO_OPENGL
 int retval;
 if (!_this) {
 SDL_UninitializedVideo();
 return -1;
 _this->gl_config.multisamplesamples = value;
 break;
 case SDL_GL_ACCELERATED_VISUAL:
 _this->gl_config.accelerated = value;
 break;
-	case SDL_GL_RETAINED_BACKING:
-		_this->gl_config.retained_backing = value;
-		break;
 default:
 SDL_SetError("Unknown OpenGL attribute");
 retval = -1;
 break;
 }
 }
 int
 SDL_GL_GetAttribute(SDL_GLattr attr, int *value)
 {
-#if SDL_VIDEO_OPENGL || SDL_VIDEO_OPENGL_ES
+#if SDL_VIDEO_OPENGL
 void (APIENTRY * glGetIntegervFunc) (GLenum pname, GLint * params);
 GLenum attrib = 0;
 glGetIntegervFunc = SDL_GL_GetProcAddress("glGetIntegerv");
 if (!glGetIntegervFunc) {
 return -1;
 }
 switch (attr) {
-	case SDL_GL_RETAINED_BACKING:
-		*value = _this->gl_config.retained_backing;
-		return 0;
 case SDL_GL_RED_SIZE:
 attrib = GL_RED_BITS;
 break;
 case SDL_GL_BLUE_SIZE:
 attrib = GL_BLUE_BITS;
 break;
 case SDL_GL_ALPHA_SIZE:
 attrib = GL_ALPHA_BITS;
 break;
 case SDL_GL_DOUBLEBUFFER:
-	#ifndef SDL_VIDEO_OPENGL_ES
 attrib = GL_DOUBLEBUFFER;
 break;
-	#else
-		/* I believe double buffering is the only option in OpenGL ES
-		   -- in any case, GL_DOUBLEBUFFER doesn't exist */
-		*value = 1;
-		return 0;
-	#endif
 case SDL_GL_DEPTH_SIZE:
 attrib = GL_DEPTH_BITS;
 break;
 case SDL_GL_STENCIL_SIZE:
 attrib = GL_STENCIL_BITS;
 break;
-#ifndef SDL_VIDEO_OPENGL_ES
 case SDL_GL_ACCUM_RED_SIZE:
 attrib = GL_ACCUM_RED_BITS;
 break;
 case SDL_GL_ACCUM_GREEN_SIZE:
 attrib = GL_ACCUM_GREEN_BITS;
 attrib = GL_ACCUM_BLUE_BITS;
 break;
 case SDL_GL_ACCUM_ALPHA_SIZE:
 attrib = GL_ACCUM_ALPHA_BITS;
 break;
-	case SDL_GL_STEREO:
+case SDL_GL_STEREO:
-		attrib = GL_STEREO;
+attrib = GL_STEREO;
-		break;
+break;
-#else
+case SDL_GL_MULTISAMPLEBUFFERS:
-	    case SDL_GL_ACCUM_RED_SIZE:
+attrib = GL_SAMPLE_BUFFERS_ARB;
-		case SDL_GL_ACCUM_GREEN_SIZE:
+break;
-		case SDL_GL_ACCUM_BLUE_SIZE:
+case SDL_GL_MULTISAMPLESAMPLES:
-		case SDL_GL_ACCUM_ALPHA_SIZE:
+attrib = GL_SAMPLES_ARB;
-		case SDL_GL_STEREO:
+break;
-			/* none of these are supported in OpenGL ES */
-			*value = 0;
-			return 0;
-#endif
-		case SDL_GL_MULTISAMPLEBUFFERS:
-		#ifndef SDL_VIDEO_OPENGL_ES
-			attrib = GL_SAMPLE_BUFFERS_ARB;
-		#else
-			attrib = GL_SAMPLE_BUFFERS;
-		#endif
-			break;
-		case SDL_GL_MULTISAMPLESAMPLES:
-		#ifndef SDL_VIDEO_OPENGL_ES
-			attrib = GL_SAMPLES_ARB;
-		#else
-			attrib = GL_SAMPLES;
-		#endif
-			break;
 case SDL_GL_BUFFER_SIZE:
 {
 GLint bits = 0;
 GLint component;
 if (!window) {
 return NULL;
 }
 if (!(window->flags & SDL_WINDOW_OPENGL)) {
+SDL_SetError("The specified window isn't an OpenGL window");
 return NULL;
 }
 return _this->GL_CreateContext(_this, window);
 }
 SDL_GL_SwapWindow(SDL_WindowID windowID)
 {
 SDL_Window *window = SDL_GetWindowFromID(windowID);
 if (!window) {
-		SDL_SetError("The specified window doesn't exist");
 return;
 }
 if (!(window->flags & SDL_WINDOW_OPENGL)) {
 SDL_SetError("The specified window isn't an OpenGL window");
 return;

Mercurial > sdl-ios-xcode

comparison src/video/SDL_video.c @ 2743:453ec0c21f6f