sdl-ios-xcode: src/render/opengl/SDL_render

annotate src/render/opengl/SDL_render_gl.c @ 5207:daa5463466c5

Fixed building on Android, added SDL_opengles2.h, removed unnecessary SDL_glesfuncs.h

author	Sam Lantinga <slouken@libsdl.org>
date	Sun, 06 Feb 2011 02:35:14 -0800
parents	25ffd4e5255c
children	2178ffe17222

rev	line source
1918 092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1 /*
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	2 SDL - Simple DirectMedia Layer
3697 f7b03b6838cb Fixed bug #926 Sam Lantinga <slouken@libsdl.org> parents: 3685 diff changeset	3 Copyright (C) 1997-2010 Sam Lantinga
1918 092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	4
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	5 This library is free software; you can redistribute it and/or
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	6 modify it under the terms of the GNU Lesser General Public
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	7 License as published by the Free Software Foundation; either
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	8 version 2.1 of the License, or (at your option) any later version.
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	9
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	10 This library is distributed in the hope that it will be useful,
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	11 but WITHOUT ANY WARRANTY; without even the implied warranty of
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	13 Lesser General Public License for more details.
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	14
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	15 You should have received a copy of the GNU Lesser General Public
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	16 License along with this library; if not, write to the Free Software
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	17 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	18
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	19 Sam Lantinga
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	20 slouken@libsdl.org
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	21 */
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	22 #include "SDL_config.h"
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	23
1952 420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: 1928 diff changeset	24 #if SDL_VIDEO_RENDER_OGL
1920 8a162bfdc838 Convert SDL_malloc to SDL_calloc if appropriate, slightly faster on operating systems which map the zero page for memory allocations. Sam Lantinga <slouken@libsdl.org> parents: 1919 diff changeset	25
8a162bfdc838 Convert SDL_malloc to SDL_calloc if appropriate, slightly faster on operating systems which map the zero page for memory allocations. Sam Lantinga <slouken@libsdl.org> parents: 1919 diff changeset	26 #include "SDL_opengl.h"
5157 fb424691cfc7 Moved the rendering code out to a separate directory in the hope that it can someday be completely decoupled from the rest of the library and be expanded to an awesome 2D on 3D library. Sam Lantinga <slouken@libsdl.org> parents: 5153 diff changeset	27 #include "../SDL_sysrender.h"
1918 092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	28
2246 75daa0792bd1 Added code to enable multi-threaded OpenGL on Mac OS X, pending Ryan's PBO/VBO Sam Lantinga <slouken@libsdl.org> parents: 2237 diff changeset	29 #ifdef __MACOSX__
75daa0792bd1 Added code to enable multi-threaded OpenGL on Mac OS X, pending Ryan's PBO/VBO Sam Lantinga <slouken@libsdl.org> parents: 2237 diff changeset	30 #include <OpenGL/OpenGL.h>
75daa0792bd1 Added code to enable multi-threaded OpenGL on Mac OS X, pending Ryan's PBO/VBO Sam Lantinga <slouken@libsdl.org> parents: 2237 diff changeset	31 #endif
75daa0792bd1 Added code to enable multi-threaded OpenGL on Mac OS X, pending Ryan's PBO/VBO Sam Lantinga <slouken@libsdl.org> parents: 2237 diff changeset	32
2778 38dfc890ee6b Preliminary support for YUV textures Sam Lantinga <slouken@libsdl.org> parents: 2328 diff changeset	33
1918 092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	34 /* OpenGL renderer implementation */
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	35
2230 9b7d29d2432b Optimized OpenGL renderer for Mac OS X. Sam Lantinga <slouken@libsdl.org> parents: 2222 diff changeset	36 /* Details on optimizing the texture path on Mac OS X:
5206 25ffd4e5255c Minor consistency cleanup and documentation link update. Sam Lantinga <slouken@libsdl.org> parents: 5198 diff changeset	37 http://developer.apple.com/library/mac/#documentation/GraphicsImaging/Conceptual/OpenGL-MacProgGuide/opengl_texturedata/opengl_texturedata.html
2230 9b7d29d2432b Optimized OpenGL renderer for Mac OS X. Sam Lantinga <slouken@libsdl.org> parents: 2222 diff changeset	38 */
9b7d29d2432b Optimized OpenGL renderer for Mac OS X. Sam Lantinga <slouken@libsdl.org> parents: 2222 diff changeset	39
5157 fb424691cfc7 Moved the rendering code out to a separate directory in the hope that it can someday be completely decoupled from the rest of the library and be expanded to an awesome 2D on 3D library. Sam Lantinga <slouken@libsdl.org> parents: 5153 diff changeset	40 /* Used to re-create the window with OpenGL capability */
fb424691cfc7 Moved the rendering code out to a separate directory in the hope that it can someday be completely decoupled from the rest of the library and be expanded to an awesome 2D on 3D library. Sam Lantinga <slouken@libsdl.org> parents: 5153 diff changeset	41 extern int SDL_RecreateWindow(SDL_Window * window, Uint32 flags);
2835 f38257b5d936 Initial pixel shader support for YUV textures in the GL renderer. Ryan C. Gordon <icculus@icculus.org> parents: 2833 diff changeset	42
1985 8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1975 diff changeset	43 static const float inv255f = 1.0f / 255.0f;
8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1975 diff changeset	44
1918 092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	45 static SDL_Renderer GL_CreateRenderer(SDL_Window window, Uint32 flags);
5150 ad50b3db78bd The rendering functions take a context so it's clear what window they're drawing to. This also potentially opens to the door to multi-threaded rendering in the future. Sam Lantinga <slouken@libsdl.org> parents: 5145 diff changeset	46 static void GL_WindowEvent(SDL_Renderer * renderer,
ad50b3db78bd The rendering functions take a context so it's clear what window they're drawing to. This also potentially opens to the door to multi-threaded rendering in the future. Sam Lantinga <slouken@libsdl.org> parents: 5145 diff changeset	47 const SDL_WindowEvent *event);
1918 092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	48 static int GL_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture);
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	49 static int GL_UpdateTexture(SDL_Renderer * renderer, SDL_Texture * texture,
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	50 const SDL_Rect * rect, const void *pixels,
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	51 int pitch);
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	52 static int GL_LockTexture(SDL_Renderer * renderer, SDL_Texture * texture,
5159 307ccc9c135e Made it possible to create a texture of any format, even if not supported by the renderer. Sam Lantinga <slouken@libsdl.org> parents: 5157 diff changeset	53 const SDL_Rect * rect, void *pixels, int pitch);
1918 092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	54 static void GL_UnlockTexture(SDL_Renderer * renderer, SDL_Texture * texture);
3596 f638ded38b8a Added SDL_RenderClear() as a fast method of clearing the screen to the drawing color. Sam Lantinga <slouken@libsdl.org> parents: 3536 diff changeset	55 static int GL_RenderClear(SDL_Renderer * renderer);
f638ded38b8a Added SDL_RenderClear() as a fast method of clearing the screen to the drawing color. Sam Lantinga <slouken@libsdl.org> parents: 3536 diff changeset	56 static int GL_RenderDrawPoints(SDL_Renderer * renderer,
f638ded38b8a Added SDL_RenderClear() as a fast method of clearing the screen to the drawing color. Sam Lantinga <slouken@libsdl.org> parents: 3536 diff changeset	57 const SDL_Point * points, int count);
f638ded38b8a Added SDL_RenderClear() as a fast method of clearing the screen to the drawing color. Sam Lantinga <slouken@libsdl.org> parents: 3536 diff changeset	58 static int GL_RenderDrawLines(SDL_Renderer * renderer,
f638ded38b8a Added SDL_RenderClear() as a fast method of clearing the screen to the drawing color. Sam Lantinga <slouken@libsdl.org> parents: 3536 diff changeset	59 const SDL_Point * points, int count);
f638ded38b8a Added SDL_RenderClear() as a fast method of clearing the screen to the drawing color. Sam Lantinga <slouken@libsdl.org> parents: 3536 diff changeset	60 static int GL_RenderFillRects(SDL_Renderer * renderer,
f638ded38b8a Added SDL_RenderClear() as a fast method of clearing the screen to the drawing color. Sam Lantinga <slouken@libsdl.org> parents: 3536 diff changeset	61 const SDL_Rect ** rects, int count);
1918 092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	62 static int GL_RenderCopy(SDL_Renderer * renderer, SDL_Texture * texture,
1985 8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1975 diff changeset	63 const SDL_Rect * srcrect, const SDL_Rect * dstrect);
3431 c8fbb27627d9 Work in progress on OpenGL ReadPixels/WritePixels interface Sam Lantinga <slouken@libsdl.org> parents: 3393 diff changeset	64 static int GL_RenderReadPixels(SDL_Renderer * renderer, const SDL_Rect * rect,
3435 9f62f47d989b You can specify the format for pixel data in SDL_RenderReadPixels() and SDL_RenderWritePixels() Sam Lantinga <slouken@libsdl.org> parents: 3433 diff changeset	65 Uint32 pixel_format, void * pixels, int pitch);
1918 092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	66 static void GL_RenderPresent(SDL_Renderer * renderer);
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	67 static void GL_DestroyTexture(SDL_Renderer * renderer, SDL_Texture * texture);
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	68 static void GL_DestroyRenderer(SDL_Renderer * renderer);
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	69
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	70
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	71 SDL_RenderDriver GL_RenderDriver = {
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	72 GL_CreateRenderer,
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	73 {
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	74 "opengl",
5206 25ffd4e5255c Minor consistency cleanup and documentation link update. Sam Lantinga <slouken@libsdl.org> parents: 5198 diff changeset	75 (SDL_RENDERER_ACCELERATED \| SDL_RENDERER_PRESENTVSYNC),
5159 307ccc9c135e Made it possible to create a texture of any format, even if not supported by the renderer. Sam Lantinga <slouken@libsdl.org> parents: 5157 diff changeset	76 1,
307ccc9c135e Made it possible to create a texture of any format, even if not supported by the renderer. Sam Lantinga <slouken@libsdl.org> parents: 5157 diff changeset	77 {SDL_PIXELFORMAT_ARGB8888},
1918 092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	78 0,
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	79 0}
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	80 };
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	81
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	82 typedef struct
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	83 {
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	84 SDL_GLContext context;
2833 c2e182a37f5f Whoops, can't call glOrtho() repeatedly Sam Lantinga <slouken@libsdl.org> parents: 2832 diff changeset	85 SDL_bool updateSize;
2233 fb01ee9716bc Test using glTextureRangeAPPLE Sam Lantinga <slouken@libsdl.org> parents: 2230 diff changeset	86 SDL_bool GL_ARB_texture_rectangle_supported;
1927 aeb8263d377a OpenGL renderer is feature complete! Sam Lantinga <slouken@libsdl.org> parents: 1926 diff changeset	87 int blendMode;
aeb8263d377a OpenGL renderer is feature complete! Sam Lantinga <slouken@libsdl.org> parents: 1926 diff changeset	88
aeb8263d377a OpenGL renderer is feature complete! Sam Lantinga <slouken@libsdl.org> parents: 1926 diff changeset	89 /* OpenGL functions */
aeb8263d377a OpenGL renderer is feature complete! Sam Lantinga <slouken@libsdl.org> parents: 1926 diff changeset	90 #define SDL_PROC(ret,func,params) ret (APIENTRY *func) params;
5207 daa5463466c5 Fixed building on Android, added SDL_opengles2.h, removed unnecessary SDL_glesfuncs.h Sam Lantinga <slouken@libsdl.org> parents: 5206 diff changeset	91 #include "SDL_glfuncs.h"
1927 aeb8263d377a OpenGL renderer is feature complete! Sam Lantinga <slouken@libsdl.org> parents: 1926 diff changeset	92 #undef SDL_PROC
1974 70deaf574153 Added paletted OpenGL texture support. Sam Lantinga <slouken@libsdl.org> parents: 1970 diff changeset	93
2233 fb01ee9716bc Test using glTextureRangeAPPLE Sam Lantinga <slouken@libsdl.org> parents: 2230 diff changeset	94 void (*glTextureRangeAPPLE) (GLenum target, GLsizei length,
fb01ee9716bc Test using glTextureRangeAPPLE Sam Lantinga <slouken@libsdl.org> parents: 2230 diff changeset	95 const GLvoid * pointer);
1918 092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	96 } GL_RenderData;
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	97
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	98 typedef struct
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	99 {
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	100 GLuint texture;
1920 8a162bfdc838 Convert SDL_malloc to SDL_calloc if appropriate, slightly faster on operating systems which map the zero page for memory allocations. Sam Lantinga <slouken@libsdl.org> parents: 1919 diff changeset	101 GLenum type;
1918 092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	102 GLfloat texw;
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	103 GLfloat texh;
1920 8a162bfdc838 Convert SDL_malloc to SDL_calloc if appropriate, slightly faster on operating systems which map the zero page for memory allocations. Sam Lantinga <slouken@libsdl.org> parents: 1919 diff changeset	104 GLenum format;
8a162bfdc838 Convert SDL_malloc to SDL_calloc if appropriate, slightly faster on operating systems which map the zero page for memory allocations. Sam Lantinga <slouken@libsdl.org> parents: 1919 diff changeset	105 GLenum formattype;
1918 092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	106 void *pixels;
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	107 int pitch;
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	108 } GL_TextureData;
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	109
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	110
1924 69217fdd2c0a If the OpenGL renderer is selected for a non-OpenGL window, recreate the window with OpenGL enabled. Sam Lantinga <slouken@libsdl.org> parents: 1923 diff changeset	111 static void
69217fdd2c0a If the OpenGL renderer is selected for a non-OpenGL window, recreate the window with OpenGL enabled. Sam Lantinga <slouken@libsdl.org> parents: 1923 diff changeset	112 GL_SetError(const char *prefix, GLenum result)
69217fdd2c0a If the OpenGL renderer is selected for a non-OpenGL window, recreate the window with OpenGL enabled. Sam Lantinga <slouken@libsdl.org> parents: 1923 diff changeset	113 {
69217fdd2c0a If the OpenGL renderer is selected for a non-OpenGL window, recreate the window with OpenGL enabled. Sam Lantinga <slouken@libsdl.org> parents: 1923 diff changeset	114 const char *error;
69217fdd2c0a If the OpenGL renderer is selected for a non-OpenGL window, recreate the window with OpenGL enabled. Sam Lantinga <slouken@libsdl.org> parents: 1923 diff changeset	115
69217fdd2c0a If the OpenGL renderer is selected for a non-OpenGL window, recreate the window with OpenGL enabled. Sam Lantinga <slouken@libsdl.org> parents: 1923 diff changeset	116 switch (result) {
69217fdd2c0a If the OpenGL renderer is selected for a non-OpenGL window, recreate the window with OpenGL enabled. Sam Lantinga <slouken@libsdl.org> parents: 1923 diff changeset	117 case GL_NO_ERROR:
69217fdd2c0a If the OpenGL renderer is selected for a non-OpenGL window, recreate the window with OpenGL enabled. Sam Lantinga <slouken@libsdl.org> parents: 1923 diff changeset	118 error = "GL_NO_ERROR";
69217fdd2c0a If the OpenGL renderer is selected for a non-OpenGL window, recreate the window with OpenGL enabled. Sam Lantinga <slouken@libsdl.org> parents: 1923 diff changeset	119 break;
69217fdd2c0a If the OpenGL renderer is selected for a non-OpenGL window, recreate the window with OpenGL enabled. Sam Lantinga <slouken@libsdl.org> parents: 1923 diff changeset	120 case GL_INVALID_ENUM:
69217fdd2c0a If the OpenGL renderer is selected for a non-OpenGL window, recreate the window with OpenGL enabled. Sam Lantinga <slouken@libsdl.org> parents: 1923 diff changeset	121 error = "GL_INVALID_ENUM";
69217fdd2c0a If the OpenGL renderer is selected for a non-OpenGL window, recreate the window with OpenGL enabled. Sam Lantinga <slouken@libsdl.org> parents: 1923 diff changeset	122 break;
69217fdd2c0a If the OpenGL renderer is selected for a non-OpenGL window, recreate the window with OpenGL enabled. Sam Lantinga <slouken@libsdl.org> parents: 1923 diff changeset	123 case GL_INVALID_VALUE:
69217fdd2c0a If the OpenGL renderer is selected for a non-OpenGL window, recreate the window with OpenGL enabled. Sam Lantinga <slouken@libsdl.org> parents: 1923 diff changeset	124 error = "GL_INVALID_VALUE";
69217fdd2c0a If the OpenGL renderer is selected for a non-OpenGL window, recreate the window with OpenGL enabled. Sam Lantinga <slouken@libsdl.org> parents: 1923 diff changeset	125 break;
69217fdd2c0a If the OpenGL renderer is selected for a non-OpenGL window, recreate the window with OpenGL enabled. Sam Lantinga <slouken@libsdl.org> parents: 1923 diff changeset	126 case GL_INVALID_OPERATION:
69217fdd2c0a If the OpenGL renderer is selected for a non-OpenGL window, recreate the window with OpenGL enabled. Sam Lantinga <slouken@libsdl.org> parents: 1923 diff changeset	127 error = "GL_INVALID_OPERATION";
69217fdd2c0a If the OpenGL renderer is selected for a non-OpenGL window, recreate the window with OpenGL enabled. Sam Lantinga <slouken@libsdl.org> parents: 1923 diff changeset	128 break;
69217fdd2c0a If the OpenGL renderer is selected for a non-OpenGL window, recreate the window with OpenGL enabled. Sam Lantinga <slouken@libsdl.org> parents: 1923 diff changeset	129 case GL_STACK_OVERFLOW:
69217fdd2c0a If the OpenGL renderer is selected for a non-OpenGL window, recreate the window with OpenGL enabled. Sam Lantinga <slouken@libsdl.org> parents: 1923 diff changeset	130 error = "GL_STACK_OVERFLOW";
69217fdd2c0a If the OpenGL renderer is selected for a non-OpenGL window, recreate the window with OpenGL enabled. Sam Lantinga <slouken@libsdl.org> parents: 1923 diff changeset	131 break;
69217fdd2c0a If the OpenGL renderer is selected for a non-OpenGL window, recreate the window with OpenGL enabled. Sam Lantinga <slouken@libsdl.org> parents: 1923 diff changeset	132 case GL_STACK_UNDERFLOW:
69217fdd2c0a If the OpenGL renderer is selected for a non-OpenGL window, recreate the window with OpenGL enabled. Sam Lantinga <slouken@libsdl.org> parents: 1923 diff changeset	133 error = "GL_STACK_UNDERFLOW";
69217fdd2c0a If the OpenGL renderer is selected for a non-OpenGL window, recreate the window with OpenGL enabled. Sam Lantinga <slouken@libsdl.org> parents: 1923 diff changeset	134 break;
69217fdd2c0a If the OpenGL renderer is selected for a non-OpenGL window, recreate the window with OpenGL enabled. Sam Lantinga <slouken@libsdl.org> parents: 1923 diff changeset	135 case GL_OUT_OF_MEMORY:
69217fdd2c0a If the OpenGL renderer is selected for a non-OpenGL window, recreate the window with OpenGL enabled. Sam Lantinga <slouken@libsdl.org> parents: 1923 diff changeset	136 error = "GL_OUT_OF_MEMORY";
69217fdd2c0a If the OpenGL renderer is selected for a non-OpenGL window, recreate the window with OpenGL enabled. Sam Lantinga <slouken@libsdl.org> parents: 1923 diff changeset	137 break;
69217fdd2c0a If the OpenGL renderer is selected for a non-OpenGL window, recreate the window with OpenGL enabled. Sam Lantinga <slouken@libsdl.org> parents: 1923 diff changeset	138 case GL_TABLE_TOO_LARGE:
69217fdd2c0a If the OpenGL renderer is selected for a non-OpenGL window, recreate the window with OpenGL enabled. Sam Lantinga <slouken@libsdl.org> parents: 1923 diff changeset	139 error = "GL_TABLE_TOO_LARGE";
69217fdd2c0a If the OpenGL renderer is selected for a non-OpenGL window, recreate the window with OpenGL enabled. Sam Lantinga <slouken@libsdl.org> parents: 1923 diff changeset	140 break;
69217fdd2c0a If the OpenGL renderer is selected for a non-OpenGL window, recreate the window with OpenGL enabled. Sam Lantinga <slouken@libsdl.org> parents: 1923 diff changeset	141 default:
69217fdd2c0a If the OpenGL renderer is selected for a non-OpenGL window, recreate the window with OpenGL enabled. Sam Lantinga <slouken@libsdl.org> parents: 1923 diff changeset	142 error = "UNKNOWN";
69217fdd2c0a If the OpenGL renderer is selected for a non-OpenGL window, recreate the window with OpenGL enabled. Sam Lantinga <slouken@libsdl.org> parents: 1923 diff changeset	143 break;
69217fdd2c0a If the OpenGL renderer is selected for a non-OpenGL window, recreate the window with OpenGL enabled. Sam Lantinga <slouken@libsdl.org> parents: 1923 diff changeset	144 }
69217fdd2c0a If the OpenGL renderer is selected for a non-OpenGL window, recreate the window with OpenGL enabled. Sam Lantinga <slouken@libsdl.org> parents: 1923 diff changeset	145 SDL_SetError("%s: %s", prefix, error);
69217fdd2c0a If the OpenGL renderer is selected for a non-OpenGL window, recreate the window with OpenGL enabled. Sam Lantinga <slouken@libsdl.org> parents: 1923 diff changeset	146 }
69217fdd2c0a If the OpenGL renderer is selected for a non-OpenGL window, recreate the window with OpenGL enabled. Sam Lantinga <slouken@libsdl.org> parents: 1923 diff changeset	147
1927 aeb8263d377a OpenGL renderer is feature complete! Sam Lantinga <slouken@libsdl.org> parents: 1926 diff changeset	148 static int
aeb8263d377a OpenGL renderer is feature complete! Sam Lantinga <slouken@libsdl.org> parents: 1926 diff changeset	149 GL_LoadFunctions(GL_RenderData * data)
aeb8263d377a OpenGL renderer is feature complete! Sam Lantinga <slouken@libsdl.org> parents: 1926 diff changeset	150 {
aeb8263d377a OpenGL renderer is feature complete! Sam Lantinga <slouken@libsdl.org> parents: 1926 diff changeset	151 #ifdef __SDL_NOGETPROCADDR__
aeb8263d377a OpenGL renderer is feature complete! Sam Lantinga <slouken@libsdl.org> parents: 1926 diff changeset	152 #define SDL_PROC(ret,func,params) data->func=func;
aeb8263d377a OpenGL renderer is feature complete! Sam Lantinga <slouken@libsdl.org> parents: 1926 diff changeset	153 #else
aeb8263d377a OpenGL renderer is feature complete! Sam Lantinga <slouken@libsdl.org> parents: 1926 diff changeset	154 #define SDL_PROC(ret,func,params) \
aeb8263d377a OpenGL renderer is feature complete! Sam Lantinga <slouken@libsdl.org> parents: 1926 diff changeset	155 do { \
aeb8263d377a OpenGL renderer is feature complete! Sam Lantinga <slouken@libsdl.org> parents: 1926 diff changeset	156 data->func = SDL_GL_GetProcAddress(#func); \
aeb8263d377a OpenGL renderer is feature complete! Sam Lantinga <slouken@libsdl.org> parents: 1926 diff changeset	157 if ( ! data->func ) { \
aeb8263d377a OpenGL renderer is feature complete! Sam Lantinga <slouken@libsdl.org> parents: 1926 diff changeset	158 SDL_SetError("Couldn't load GL function %s: %s\n", #func, SDL_GetError()); \
aeb8263d377a OpenGL renderer is feature complete! Sam Lantinga <slouken@libsdl.org> parents: 1926 diff changeset	159 return -1; \
aeb8263d377a OpenGL renderer is feature complete! Sam Lantinga <slouken@libsdl.org> parents: 1926 diff changeset	160 } \
aeb8263d377a OpenGL renderer is feature complete! Sam Lantinga <slouken@libsdl.org> parents: 1926 diff changeset	161 } while ( 0 );
aeb8263d377a OpenGL renderer is feature complete! Sam Lantinga <slouken@libsdl.org> parents: 1926 diff changeset	162 #endif /* __SDL_NOGETPROCADDR__ */
aeb8263d377a OpenGL renderer is feature complete! Sam Lantinga <slouken@libsdl.org> parents: 1926 diff changeset	163
5207 daa5463466c5 Fixed building on Android, added SDL_opengles2.h, removed unnecessary SDL_glesfuncs.h Sam Lantinga <slouken@libsdl.org> parents: 5206 diff changeset	164 #include "SDL_glfuncs.h"
1927 aeb8263d377a OpenGL renderer is feature complete! Sam Lantinga <slouken@libsdl.org> parents: 1926 diff changeset	165 #undef SDL_PROC
aeb8263d377a OpenGL renderer is feature complete! Sam Lantinga <slouken@libsdl.org> parents: 1926 diff changeset	166 return 0;
aeb8263d377a OpenGL renderer is feature complete! Sam Lantinga <slouken@libsdl.org> parents: 1926 diff changeset	167 }
aeb8263d377a OpenGL renderer is feature complete! Sam Lantinga <slouken@libsdl.org> parents: 1926 diff changeset	168
1918 092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	169 SDL_Renderer *
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	170 GL_CreateRenderer(SDL_Window * window, Uint32 flags)
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	171 {
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	172 SDL_Renderer *renderer;
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	173 GL_RenderData *data;
1952 420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: 1928 diff changeset	174 GLint value;
5157 fb424691cfc7 Moved the rendering code out to a separate directory in the hope that it can someday be completely decoupled from the rest of the library and be expanded to an awesome 2D on 3D library. Sam Lantinga <slouken@libsdl.org> parents: 5153 diff changeset	175 Uint32 window_flags;
1918 092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	176
5157 fb424691cfc7 Moved the rendering code out to a separate directory in the hope that it can someday be completely decoupled from the rest of the library and be expanded to an awesome 2D on 3D library. Sam Lantinga <slouken@libsdl.org> parents: 5153 diff changeset	177 window_flags = SDL_GetWindowFlags(window);
fb424691cfc7 Moved the rendering code out to a separate directory in the hope that it can someday be completely decoupled from the rest of the library and be expanded to an awesome 2D on 3D library. Sam Lantinga <slouken@libsdl.org> parents: 5153 diff changeset	178 if (!(window_flags & SDL_WINDOW_OPENGL)) {
fb424691cfc7 Moved the rendering code out to a separate directory in the hope that it can someday be completely decoupled from the rest of the library and be expanded to an awesome 2D on 3D library. Sam Lantinga <slouken@libsdl.org> parents: 5153 diff changeset	179 if (SDL_RecreateWindow(window, window_flags \| SDL_WINDOW_OPENGL) < 0) {
1924 69217fdd2c0a If the OpenGL renderer is selected for a non-OpenGL window, recreate the window with OpenGL enabled. Sam Lantinga <slouken@libsdl.org> parents: 1923 diff changeset	180 return NULL;
69217fdd2c0a If the OpenGL renderer is selected for a non-OpenGL window, recreate the window with OpenGL enabled. Sam Lantinga <slouken@libsdl.org> parents: 1923 diff changeset	181 }
1918 092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	182 }
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	183
1920 8a162bfdc838 Convert SDL_malloc to SDL_calloc if appropriate, slightly faster on operating systems which map the zero page for memory allocations. Sam Lantinga <slouken@libsdl.org> parents: 1919 diff changeset	184 renderer = (SDL_Renderer ) SDL_calloc(1, sizeof(renderer));
1918 092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	185 if (!renderer) {
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	186 SDL_OutOfMemory();
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	187 return NULL;
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	188 }
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	189
1920 8a162bfdc838 Convert SDL_malloc to SDL_calloc if appropriate, slightly faster on operating systems which map the zero page for memory allocations. Sam Lantinga <slouken@libsdl.org> parents: 1919 diff changeset	190 data = (GL_RenderData ) SDL_calloc(1, sizeof(data));
1918 092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	191 if (!data) {
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	192 GL_DestroyRenderer(renderer);
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	193 SDL_OutOfMemory();
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	194 return NULL;
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	195 }
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	196
5150 ad50b3db78bd The rendering functions take a context so it's clear what window they're drawing to. This also potentially opens to the door to multi-threaded rendering in the future. Sam Lantinga <slouken@libsdl.org> parents: 5145 diff changeset	197 renderer->WindowEvent = GL_WindowEvent;
1918 092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	198 renderer->CreateTexture = GL_CreateTexture;
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	199 renderer->UpdateTexture = GL_UpdateTexture;
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	200 renderer->LockTexture = GL_LockTexture;
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	201 renderer->UnlockTexture = GL_UnlockTexture;
3596 f638ded38b8a Added SDL_RenderClear() as a fast method of clearing the screen to the drawing color. Sam Lantinga <slouken@libsdl.org> parents: 3536 diff changeset	202 renderer->RenderClear = GL_RenderClear;
f638ded38b8a Added SDL_RenderClear() as a fast method of clearing the screen to the drawing color. Sam Lantinga <slouken@libsdl.org> parents: 3536 diff changeset	203 renderer->RenderDrawPoints = GL_RenderDrawPoints;
f638ded38b8a Added SDL_RenderClear() as a fast method of clearing the screen to the drawing color. Sam Lantinga <slouken@libsdl.org> parents: 3536 diff changeset	204 renderer->RenderDrawLines = GL_RenderDrawLines;
f638ded38b8a Added SDL_RenderClear() as a fast method of clearing the screen to the drawing color. Sam Lantinga <slouken@libsdl.org> parents: 3536 diff changeset	205 renderer->RenderFillRects = GL_RenderFillRects;
1918 092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	206 renderer->RenderCopy = GL_RenderCopy;
3431 c8fbb27627d9 Work in progress on OpenGL ReadPixels/WritePixels interface Sam Lantinga <slouken@libsdl.org> parents: 3393 diff changeset	207 renderer->RenderReadPixels = GL_RenderReadPixels;
1918 092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	208 renderer->RenderPresent = GL_RenderPresent;
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	209 renderer->DestroyTexture = GL_DestroyTexture;
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	210 renderer->DestroyRenderer = GL_DestroyRenderer;
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	211 renderer->info = GL_RenderDriver.info;
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	212 renderer->driverdata = data;
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	213
5145 c8e049de174c Making the API simpler, the renderer present semantics are always having a backbuffer and then discarding it. This is best for hardware accelerated rendering. Sam Lantinga <slouken@libsdl.org> parents: 5144 diff changeset	214 renderer->info.flags = SDL_RENDERER_ACCELERATED;
1918 092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	215
3685 64ce267332c6 Switched from SDL_WindowID and SDL_TextureID to SDL_Window* and SDL_Texture* for code simplicity and improved performance. Sam Lantinga <slouken@libsdl.org> parents: 3607 diff changeset	216 data->context = SDL_GL_CreateContext(window);
1918 092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	217 if (!data->context) {
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	218 GL_DestroyRenderer(renderer);
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	219 return NULL;
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	220 }
3685 64ce267332c6 Switched from SDL_WindowID and SDL_TextureID to SDL_Window* and SDL_Texture* for code simplicity and improved performance. Sam Lantinga <slouken@libsdl.org> parents: 3607 diff changeset	221 if (SDL_GL_MakeCurrent(window, data->context) < 0) {
1918 092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	222 GL_DestroyRenderer(renderer);
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	223 return NULL;
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	224 }
5207 daa5463466c5 Fixed building on Android, added SDL_opengles2.h, removed unnecessary SDL_glesfuncs.h Sam Lantinga <slouken@libsdl.org> parents: 5206 diff changeset	225
daa5463466c5 Fixed building on Android, added SDL_opengles2.h, removed unnecessary SDL_glesfuncs.h Sam Lantinga <slouken@libsdl.org> parents: 5206 diff changeset	226 if (GL_LoadFunctions(data) < 0) {
daa5463466c5 Fixed building on Android, added SDL_opengles2.h, removed unnecessary SDL_glesfuncs.h Sam Lantinga <slouken@libsdl.org> parents: 5206 diff changeset	227 GL_DestroyRenderer(renderer);
daa5463466c5 Fixed building on Android, added SDL_opengles2.h, removed unnecessary SDL_glesfuncs.h Sam Lantinga <slouken@libsdl.org> parents: 5206 diff changeset	228 return NULL;
daa5463466c5 Fixed building on Android, added SDL_opengles2.h, removed unnecessary SDL_glesfuncs.h Sam Lantinga <slouken@libsdl.org> parents: 5206 diff changeset	229 }
daa5463466c5 Fixed building on Android, added SDL_opengles2.h, removed unnecessary SDL_glesfuncs.h Sam Lantinga <slouken@libsdl.org> parents: 5206 diff changeset	230
2246 75daa0792bd1 Added code to enable multi-threaded OpenGL on Mac OS X, pending Ryan's PBO/VBO Sam Lantinga <slouken@libsdl.org> parents: 2237 diff changeset	231 #ifdef __MACOSX__
75daa0792bd1 Added code to enable multi-threaded OpenGL on Mac OS X, pending Ryan's PBO/VBO Sam Lantinga <slouken@libsdl.org> parents: 2237 diff changeset	232 /* Enable multi-threaded rendering */
75daa0792bd1 Added code to enable multi-threaded OpenGL on Mac OS X, pending Ryan's PBO/VBO Sam Lantinga <slouken@libsdl.org> parents: 2237 diff changeset	233 /* Disabled until Ryan finishes his VBO/PBO code...
2295 dbc6d1893869 Checking in Christian Walther's patch for x11 keyboard input. Minor code tweaks by Bob. Bob Pendleton <bob@pendleton.com> parents: 2275 diff changeset	234 CGLEnable(CGLGetCurrentContext(), kCGLCEMPEngine);
dbc6d1893869 Checking in Christian Walther's patch for x11 keyboard input. Minor code tweaks by Bob. Bob Pendleton <bob@pendleton.com> parents: 2275 diff changeset	235 */
2246 75daa0792bd1 Added code to enable multi-threaded OpenGL on Mac OS X, pending Ryan's PBO/VBO Sam Lantinga <slouken@libsdl.org> parents: 2237 diff changeset	236 #endif
75daa0792bd1 Added code to enable multi-threaded OpenGL on Mac OS X, pending Ryan's PBO/VBO Sam Lantinga <slouken@libsdl.org> parents: 2237 diff changeset	237
1965 a788656ca29a SDL constants are all uppercase. Sam Lantinga <slouken@libsdl.org> parents: 1952 diff changeset	238 if (flags & SDL_RENDERER_PRESENTVSYNC) {
1918 092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	239 SDL_GL_SetSwapInterval(1);
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	240 } else {
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	241 SDL_GL_SetSwapInterval(0);
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	242 }
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	243 if (SDL_GL_GetSwapInterval() > 0) {
1965 a788656ca29a SDL constants are all uppercase. Sam Lantinga <slouken@libsdl.org> parents: 1952 diff changeset	244 renderer->info.flags \|= SDL_RENDERER_PRESENTVSYNC;
1918 092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	245 }
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	246
1952 420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: 1928 diff changeset	247 data->glGetIntegerv(GL_MAX_TEXTURE_SIZE, &value);
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: 1928 diff changeset	248 renderer->info.max_texture_width = value;
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: 1928 diff changeset	249 data->glGetIntegerv(GL_MAX_TEXTURE_SIZE, &value);
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: 1928 diff changeset	250 renderer->info.max_texture_height = value;
1920 8a162bfdc838 Convert SDL_malloc to SDL_calloc if appropriate, slightly faster on operating systems which map the zero page for memory allocations. Sam Lantinga <slouken@libsdl.org> parents: 1919 diff changeset	251
1926 307355678142 Added SDL_GL_ExtensionSupported() Sam Lantinga <slouken@libsdl.org> parents: 1924 diff changeset	252 if (SDL_GL_ExtensionSupported("GL_ARB_texture_rectangle")
307355678142 Added SDL_GL_ExtensionSupported() Sam Lantinga <slouken@libsdl.org> parents: 1924 diff changeset	253 \|\| SDL_GL_ExtensionSupported("GL_EXT_texture_rectangle")) {
307355678142 Added SDL_GL_ExtensionSupported() Sam Lantinga <slouken@libsdl.org> parents: 1924 diff changeset	254 data->GL_ARB_texture_rectangle_supported = SDL_TRUE;
307355678142 Added SDL_GL_ExtensionSupported() Sam Lantinga <slouken@libsdl.org> parents: 1924 diff changeset	255 }
2233 fb01ee9716bc Test using glTextureRangeAPPLE Sam Lantinga <slouken@libsdl.org> parents: 2230 diff changeset	256 if (SDL_GL_ExtensionSupported("GL_APPLE_texture_range")) {
fb01ee9716bc Test using glTextureRangeAPPLE Sam Lantinga <slouken@libsdl.org> parents: 2230 diff changeset	257 data->glTextureRangeAPPLE =
fb01ee9716bc Test using glTextureRangeAPPLE Sam Lantinga <slouken@libsdl.org> parents: 2230 diff changeset	258 (void ()(GLenum, GLsizei, const GLvoid ))
fb01ee9716bc Test using glTextureRangeAPPLE Sam Lantinga <slouken@libsdl.org> parents: 2230 diff changeset	259 SDL_GL_GetProcAddress("glTextureRangeAPPLE");
fb01ee9716bc Test using glTextureRangeAPPLE Sam Lantinga <slouken@libsdl.org> parents: 2230 diff changeset	260 }
1920 8a162bfdc838 Convert SDL_malloc to SDL_calloc if appropriate, slightly faster on operating systems which map the zero page for memory allocations. Sam Lantinga <slouken@libsdl.org> parents: 1919 diff changeset	261
1918 092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	262 /* Set up parameters for rendering */
1927 aeb8263d377a OpenGL renderer is feature complete! Sam Lantinga <slouken@libsdl.org> parents: 1926 diff changeset	263 data->blendMode = -1;
aeb8263d377a OpenGL renderer is feature complete! Sam Lantinga <slouken@libsdl.org> parents: 1926 diff changeset	264 data->glDisable(GL_DEPTH_TEST);
aeb8263d377a OpenGL renderer is feature complete! Sam Lantinga <slouken@libsdl.org> parents: 1926 diff changeset	265 data->glDisable(GL_CULL_FACE);
3262 e3d33bd599eb Stefan Ullinger Sam Lantinga <slouken@libsdl.org> parents: 3253 diff changeset	266 /* This ended up causing video discrepancies between OpenGL and Direct3D */
e3d33bd599eb Stefan Ullinger Sam Lantinga <slouken@libsdl.org> parents: 3253 diff changeset	267 /data->glEnable(GL_LINE_SMOOTH);/
1926 307355678142 Added SDL_GL_ExtensionSupported() Sam Lantinga <slouken@libsdl.org> parents: 1924 diff changeset	268 if (data->GL_ARB_texture_rectangle_supported) {
1927 aeb8263d377a OpenGL renderer is feature complete! Sam Lantinga <slouken@libsdl.org> parents: 1926 diff changeset	269 data->glEnable(GL_TEXTURE_RECTANGLE_ARB);
1926 307355678142 Added SDL_GL_ExtensionSupported() Sam Lantinga <slouken@libsdl.org> parents: 1924 diff changeset	270 } else {
1927 aeb8263d377a OpenGL renderer is feature complete! Sam Lantinga <slouken@libsdl.org> parents: 1926 diff changeset	271 data->glEnable(GL_TEXTURE_2D);
1926 307355678142 Added SDL_GL_ExtensionSupported() Sam Lantinga <slouken@libsdl.org> parents: 1924 diff changeset	272 }
2833 c2e182a37f5f Whoops, can't call glOrtho() repeatedly Sam Lantinga <slouken@libsdl.org> parents: 2832 diff changeset	273 data->updateSize = SDL_TRUE;
1918 092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	274
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	275 return renderer;
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	276 }
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	277
5150 ad50b3db78bd The rendering functions take a context so it's clear what window they're drawing to. This also potentially opens to the door to multi-threaded rendering in the future. Sam Lantinga <slouken@libsdl.org> parents: 5145 diff changeset	278 static SDL_GLContext SDL_CurrentContext = NULL;
ad50b3db78bd The rendering functions take a context so it's clear what window they're drawing to. This also potentially opens to the door to multi-threaded rendering in the future. Sam Lantinga <slouken@libsdl.org> parents: 5145 diff changeset	279
1923 d4572b97b08f Switch OpenGL contexts when switching render contexts. Sam Lantinga <slouken@libsdl.org> parents: 1922 diff changeset	280 static int
d4572b97b08f Switch OpenGL contexts when switching render contexts. Sam Lantinga <slouken@libsdl.org> parents: 1922 diff changeset	281 GL_ActivateRenderer(SDL_Renderer * renderer)
d4572b97b08f Switch OpenGL contexts when switching render contexts. Sam Lantinga <slouken@libsdl.org> parents: 1922 diff changeset	282 {
d4572b97b08f Switch OpenGL contexts when switching render contexts. Sam Lantinga <slouken@libsdl.org> parents: 1922 diff changeset	283 GL_RenderData data = (GL_RenderData ) renderer->driverdata;
3685 64ce267332c6 Switched from SDL_WindowID and SDL_TextureID to SDL_Window* and SDL_Texture* for code simplicity and improved performance. Sam Lantinga <slouken@libsdl.org> parents: 3607 diff changeset	284 SDL_Window *window = renderer->window;
1923 d4572b97b08f Switch OpenGL contexts when switching render contexts. Sam Lantinga <slouken@libsdl.org> parents: 1922 diff changeset	285
5150 ad50b3db78bd The rendering functions take a context so it's clear what window they're drawing to. This also potentially opens to the door to multi-threaded rendering in the future. Sam Lantinga <slouken@libsdl.org> parents: 5145 diff changeset	286 if (SDL_CurrentContext != data->context) {
ad50b3db78bd The rendering functions take a context so it's clear what window they're drawing to. This also potentially opens to the door to multi-threaded rendering in the future. Sam Lantinga <slouken@libsdl.org> parents: 5145 diff changeset	287 if (SDL_GL_MakeCurrent(window, data->context) < 0) {
ad50b3db78bd The rendering functions take a context so it's clear what window they're drawing to. This also potentially opens to the door to multi-threaded rendering in the future. Sam Lantinga <slouken@libsdl.org> parents: 5145 diff changeset	288 return -1;
ad50b3db78bd The rendering functions take a context so it's clear what window they're drawing to. This also potentially opens to the door to multi-threaded rendering in the future. Sam Lantinga <slouken@libsdl.org> parents: 5145 diff changeset	289 }
ad50b3db78bd The rendering functions take a context so it's clear what window they're drawing to. This also potentially opens to the door to multi-threaded rendering in the future. Sam Lantinga <slouken@libsdl.org> parents: 5145 diff changeset	290 SDL_CurrentContext = data->context;
1970 db3ba6c0d0df Allow the render context to do necessary work when the video mode changes. Sam Lantinga <slouken@libsdl.org> parents: 1965 diff changeset	291 }
2833 c2e182a37f5f Whoops, can't call glOrtho() repeatedly Sam Lantinga <slouken@libsdl.org> parents: 2832 diff changeset	292 if (data->updateSize) {
5157 fb424691cfc7 Moved the rendering code out to a separate directory in the hope that it can someday be completely decoupled from the rest of the library and be expanded to an awesome 2D on 3D library. Sam Lantinga <slouken@libsdl.org> parents: 5153 diff changeset	293 int w, h;
fb424691cfc7 Moved the rendering code out to a separate directory in the hope that it can someday be completely decoupled from the rest of the library and be expanded to an awesome 2D on 3D library. Sam Lantinga <slouken@libsdl.org> parents: 5153 diff changeset	294
fb424691cfc7 Moved the rendering code out to a separate directory in the hope that it can someday be completely decoupled from the rest of the library and be expanded to an awesome 2D on 3D library. Sam Lantinga <slouken@libsdl.org> parents: 5153 diff changeset	295 SDL_GetWindowSize(window, &w, &h);
2836 b128b94ed31e Rebind the context to the window area and update matrices when the window size changes Sam Lantinga <slouken@libsdl.org> parents: 2835 diff changeset	296 data->glMatrixMode(GL_PROJECTION);
b128b94ed31e Rebind the context to the window area and update matrices when the window size changes Sam Lantinga <slouken@libsdl.org> parents: 2835 diff changeset	297 data->glLoadIdentity();
b128b94ed31e Rebind the context to the window area and update matrices when the window size changes Sam Lantinga <slouken@libsdl.org> parents: 2835 diff changeset	298 data->glMatrixMode(GL_MODELVIEW);
b128b94ed31e Rebind the context to the window area and update matrices when the window size changes Sam Lantinga <slouken@libsdl.org> parents: 2835 diff changeset	299 data->glLoadIdentity();
5157 fb424691cfc7 Moved the rendering code out to a separate directory in the hope that it can someday be completely decoupled from the rest of the library and be expanded to an awesome 2D on 3D library. Sam Lantinga <slouken@libsdl.org> parents: 5153 diff changeset	300 data->glViewport(0, 0, w, h);
fb424691cfc7 Moved the rendering code out to a separate directory in the hope that it can someday be completely decoupled from the rest of the library and be expanded to an awesome 2D on 3D library. Sam Lantinga <slouken@libsdl.org> parents: 5153 diff changeset	301 data->glOrtho(0.0, (GLdouble) w, (GLdouble) h, 0.0, 0.0, 1.0);
2833 c2e182a37f5f Whoops, can't call glOrtho() repeatedly Sam Lantinga <slouken@libsdl.org> parents: 2832 diff changeset	302 data->updateSize = SDL_FALSE;
c2e182a37f5f Whoops, can't call glOrtho() repeatedly Sam Lantinga <slouken@libsdl.org> parents: 2832 diff changeset	303 }
1970 db3ba6c0d0df Allow the render context to do necessary work when the video mode changes. Sam Lantinga <slouken@libsdl.org> parents: 1965 diff changeset	304 return 0;
db3ba6c0d0df Allow the render context to do necessary work when the video mode changes. Sam Lantinga <slouken@libsdl.org> parents: 1965 diff changeset	305 }
db3ba6c0d0df Allow the render context to do necessary work when the video mode changes. Sam Lantinga <slouken@libsdl.org> parents: 1965 diff changeset	306
5150 ad50b3db78bd The rendering functions take a context so it's clear what window they're drawing to. This also potentially opens to the door to multi-threaded rendering in the future. Sam Lantinga <slouken@libsdl.org> parents: 5145 diff changeset	307 static void
ad50b3db78bd The rendering functions take a context so it's clear what window they're drawing to. This also potentially opens to the door to multi-threaded rendering in the future. Sam Lantinga <slouken@libsdl.org> parents: 5145 diff changeset	308 GL_WindowEvent(SDL_Renderer * renderer, const SDL_WindowEvent *event)
1970 db3ba6c0d0df Allow the render context to do necessary work when the video mode changes. Sam Lantinga <slouken@libsdl.org> parents: 1965 diff changeset	309 {
db3ba6c0d0df Allow the render context to do necessary work when the video mode changes. Sam Lantinga <slouken@libsdl.org> parents: 1965 diff changeset	310 GL_RenderData data = (GL_RenderData ) renderer->driverdata;
db3ba6c0d0df Allow the render context to do necessary work when the video mode changes. Sam Lantinga <slouken@libsdl.org> parents: 1965 diff changeset	311
5150 ad50b3db78bd The rendering functions take a context so it's clear what window they're drawing to. This also potentially opens to the door to multi-threaded rendering in the future. Sam Lantinga <slouken@libsdl.org> parents: 5145 diff changeset	312 if (event->event == SDL_WINDOWEVENT_RESIZED) {
ad50b3db78bd The rendering functions take a context so it's clear what window they're drawing to. This also potentially opens to the door to multi-threaded rendering in the future. Sam Lantinga <slouken@libsdl.org> parents: 5145 diff changeset	313 /* Rebind the context to the window area and update matrices */
ad50b3db78bd The rendering functions take a context so it's clear what window they're drawing to. This also potentially opens to the door to multi-threaded rendering in the future. Sam Lantinga <slouken@libsdl.org> parents: 5145 diff changeset	314 SDL_CurrentContext = NULL;
ad50b3db78bd The rendering functions take a context so it's clear what window they're drawing to. This also potentially opens to the door to multi-threaded rendering in the future. Sam Lantinga <slouken@libsdl.org> parents: 5145 diff changeset	315 data->updateSize = SDL_TRUE;
ad50b3db78bd The rendering functions take a context so it's clear what window they're drawing to. This also potentially opens to the door to multi-threaded rendering in the future. Sam Lantinga <slouken@libsdl.org> parents: 5145 diff changeset	316 }
1923 d4572b97b08f Switch OpenGL contexts when switching render contexts. Sam Lantinga <slouken@libsdl.org> parents: 1922 diff changeset	317 }
d4572b97b08f Switch OpenGL contexts when switching render contexts. Sam Lantinga <slouken@libsdl.org> parents: 1922 diff changeset	318
1922 4905cac7a4bd Fixed OpenGL blend modes, added power of 2 texture code Sam Lantinga <slouken@libsdl.org> parents: 1921 diff changeset	319 static __inline__ int
4905cac7a4bd Fixed OpenGL blend modes, added power of 2 texture code Sam Lantinga <slouken@libsdl.org> parents: 1921 diff changeset	320 power_of_2(int input)
4905cac7a4bd Fixed OpenGL blend modes, added power of 2 texture code Sam Lantinga <slouken@libsdl.org> parents: 1921 diff changeset	321 {
4905cac7a4bd Fixed OpenGL blend modes, added power of 2 texture code Sam Lantinga <slouken@libsdl.org> parents: 1921 diff changeset	322 int value = 1;
4905cac7a4bd Fixed OpenGL blend modes, added power of 2 texture code Sam Lantinga <slouken@libsdl.org> parents: 1921 diff changeset	323
4905cac7a4bd Fixed OpenGL blend modes, added power of 2 texture code Sam Lantinga <slouken@libsdl.org> parents: 1921 diff changeset	324 while (value < input) {
4905cac7a4bd Fixed OpenGL blend modes, added power of 2 texture code Sam Lantinga <slouken@libsdl.org> parents: 1921 diff changeset	325 value <<= 1;
4905cac7a4bd Fixed OpenGL blend modes, added power of 2 texture code Sam Lantinga <slouken@libsdl.org> parents: 1921 diff changeset	326 }
4905cac7a4bd Fixed OpenGL blend modes, added power of 2 texture code Sam Lantinga <slouken@libsdl.org> parents: 1921 diff changeset	327 return value;
4905cac7a4bd Fixed OpenGL blend modes, added power of 2 texture code Sam Lantinga <slouken@libsdl.org> parents: 1921 diff changeset	328 }
4905cac7a4bd Fixed OpenGL blend modes, added power of 2 texture code Sam Lantinga <slouken@libsdl.org> parents: 1921 diff changeset	329
3433 ad845d9835aa Hmm, this isn't going to work, is it? Sam Lantinga <slouken@libsdl.org> parents: 3431 diff changeset	330 static __inline__ SDL_bool
ad845d9835aa Hmm, this isn't going to work, is it? Sam Lantinga <slouken@libsdl.org> parents: 3431 diff changeset	331 convert_format(GL_RenderData *renderdata, Uint32 pixel_format,
ad845d9835aa Hmm, this isn't going to work, is it? Sam Lantinga <slouken@libsdl.org> parents: 3431 diff changeset	332 GLint* internalFormat, GLenum* format, GLenum* type)
ad845d9835aa Hmm, this isn't going to work, is it? Sam Lantinga <slouken@libsdl.org> parents: 3431 diff changeset	333 {
ad845d9835aa Hmm, this isn't going to work, is it? Sam Lantinga <slouken@libsdl.org> parents: 3431 diff changeset	334 switch (pixel_format) {
ad845d9835aa Hmm, this isn't going to work, is it? Sam Lantinga <slouken@libsdl.org> parents: 3431 diff changeset	335 case SDL_PIXELFORMAT_ARGB8888:
ad845d9835aa Hmm, this isn't going to work, is it? Sam Lantinga <slouken@libsdl.org> parents: 3431 diff changeset	336 *internalFormat = GL_RGBA8;
ad845d9835aa Hmm, this isn't going to work, is it? Sam Lantinga <slouken@libsdl.org> parents: 3431 diff changeset	337 *format = GL_BGRA;
5159 307ccc9c135e Made it possible to create a texture of any format, even if not supported by the renderer. Sam Lantinga <slouken@libsdl.org> parents: 5157 diff changeset	338 *type = GL_UNSIGNED_INT_8_8_8_8_REV;
3433 ad845d9835aa Hmm, this isn't going to work, is it? Sam Lantinga <slouken@libsdl.org> parents: 3431 diff changeset	339 break;
ad845d9835aa Hmm, this isn't going to work, is it? Sam Lantinga <slouken@libsdl.org> parents: 3431 diff changeset	340 default:
ad845d9835aa Hmm, this isn't going to work, is it? Sam Lantinga <slouken@libsdl.org> parents: 3431 diff changeset	341 return SDL_FALSE;
ad845d9835aa Hmm, this isn't going to work, is it? Sam Lantinga <slouken@libsdl.org> parents: 3431 diff changeset	342 }
ad845d9835aa Hmm, this isn't going to work, is it? Sam Lantinga <slouken@libsdl.org> parents: 3431 diff changeset	343 return SDL_TRUE;
ad845d9835aa Hmm, this isn't going to work, is it? Sam Lantinga <slouken@libsdl.org> parents: 3431 diff changeset	344 }
2835 f38257b5d936 Initial pixel shader support for YUV textures in the GL renderer. Ryan C. Gordon <icculus@icculus.org> parents: 2833 diff changeset	345
1918 092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	346 static int
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	347 GL_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture)
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	348 {
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	349 GL_RenderData renderdata = (GL_RenderData ) renderer->driverdata;
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	350 GL_TextureData *data;
1920 8a162bfdc838 Convert SDL_malloc to SDL_calloc if appropriate, slightly faster on operating systems which map the zero page for memory allocations. Sam Lantinga <slouken@libsdl.org> parents: 1919 diff changeset	351 GLint internalFormat;
8a162bfdc838 Convert SDL_malloc to SDL_calloc if appropriate, slightly faster on operating systems which map the zero page for memory allocations. Sam Lantinga <slouken@libsdl.org> parents: 1919 diff changeset	352 GLenum format, type;
1922 4905cac7a4bd Fixed OpenGL blend modes, added power of 2 texture code Sam Lantinga <slouken@libsdl.org> parents: 1921 diff changeset	353 int texture_w, texture_h;
1924 69217fdd2c0a If the OpenGL renderer is selected for a non-OpenGL window, recreate the window with OpenGL enabled. Sam Lantinga <slouken@libsdl.org> parents: 1923 diff changeset	354 GLenum result;
1918 092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	355
5150 ad50b3db78bd The rendering functions take a context so it's clear what window they're drawing to. This also potentially opens to the door to multi-threaded rendering in the future. Sam Lantinga <slouken@libsdl.org> parents: 5145 diff changeset	356 GL_ActivateRenderer(renderer);
ad50b3db78bd The rendering functions take a context so it's clear what window they're drawing to. This also potentially opens to the door to multi-threaded rendering in the future. Sam Lantinga <slouken@libsdl.org> parents: 5145 diff changeset	357
3433 ad845d9835aa Hmm, this isn't going to work, is it? Sam Lantinga <slouken@libsdl.org> parents: 3431 diff changeset	358 if (!convert_format(renderdata, texture->format, &internalFormat,
ad845d9835aa Hmm, this isn't going to work, is it? Sam Lantinga <slouken@libsdl.org> parents: 3431 diff changeset	359 &format, &type)) {
4990 397e748d901a Improved error message for unsupported texture format Sam Lantinga <slouken@libsdl.org> parents: 4929 diff changeset	360 SDL_SetError("Texture format %s not supported by OpenGL",
397e748d901a Improved error message for unsupported texture format Sam Lantinga <slouken@libsdl.org> parents: 4929 diff changeset	361 SDL_GetPixelFormatName(texture->format));
1920 8a162bfdc838 Convert SDL_malloc to SDL_calloc if appropriate, slightly faster on operating systems which map the zero page for memory allocations. Sam Lantinga <slouken@libsdl.org> parents: 1919 diff changeset	362 return -1;
8a162bfdc838 Convert SDL_malloc to SDL_calloc if appropriate, slightly faster on operating systems which map the zero page for memory allocations. Sam Lantinga <slouken@libsdl.org> parents: 1919 diff changeset	363 }
8a162bfdc838 Convert SDL_malloc to SDL_calloc if appropriate, slightly faster on operating systems which map the zero page for memory allocations. Sam Lantinga <slouken@libsdl.org> parents: 1919 diff changeset	364
8a162bfdc838 Convert SDL_malloc to SDL_calloc if appropriate, slightly faster on operating systems which map the zero page for memory allocations. Sam Lantinga <slouken@libsdl.org> parents: 1919 diff changeset	365 data = (GL_TextureData ) SDL_calloc(1, sizeof(data));
1918 092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	366 if (!data) {
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	367 SDL_OutOfMemory();
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	368 return -1;
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	369 }
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	370
2222 926294b2bb4e Emphasized the separation between SDL_Surface and SDL_Texture Sam Lantinga <slouken@libsdl.org> parents: 1986 diff changeset	371 if (texture->access == SDL_TEXTUREACCESS_STREAMING) {
5159 307ccc9c135e Made it possible to create a texture of any format, even if not supported by the renderer. Sam Lantinga <slouken@libsdl.org> parents: 5157 diff changeset	372 data->pitch = texture->w * SDL_BYTESPERPIXEL(texture->format);
2222 926294b2bb4e Emphasized the separation between SDL_Surface and SDL_Texture Sam Lantinga <slouken@libsdl.org> parents: 1986 diff changeset	373 data->pixels = SDL_malloc(texture->h * data->pitch);
926294b2bb4e Emphasized the separation between SDL_Surface and SDL_Texture Sam Lantinga <slouken@libsdl.org> parents: 1986 diff changeset	374 if (!data->pixels) {
926294b2bb4e Emphasized the separation between SDL_Surface and SDL_Texture Sam Lantinga <slouken@libsdl.org> parents: 1986 diff changeset	375 SDL_OutOfMemory();
926294b2bb4e Emphasized the separation between SDL_Surface and SDL_Texture Sam Lantinga <slouken@libsdl.org> parents: 1986 diff changeset	376 SDL_free(data);
926294b2bb4e Emphasized the separation between SDL_Surface and SDL_Texture Sam Lantinga <slouken@libsdl.org> parents: 1986 diff changeset	377 return -1;
926294b2bb4e Emphasized the separation between SDL_Surface and SDL_Texture Sam Lantinga <slouken@libsdl.org> parents: 1986 diff changeset	378 }
926294b2bb4e Emphasized the separation between SDL_Surface and SDL_Texture Sam Lantinga <slouken@libsdl.org> parents: 1986 diff changeset	379 }
926294b2bb4e Emphasized the separation between SDL_Surface and SDL_Texture Sam Lantinga <slouken@libsdl.org> parents: 1986 diff changeset	380
1918 092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	381 texture->driverdata = data;
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	382
1927 aeb8263d377a OpenGL renderer is feature complete! Sam Lantinga <slouken@libsdl.org> parents: 1926 diff changeset	383 renderdata->glGetError();
aeb8263d377a OpenGL renderer is feature complete! Sam Lantinga <slouken@libsdl.org> parents: 1926 diff changeset	384 renderdata->glGenTextures(1, &data->texture);
1926 307355678142 Added SDL_GL_ExtensionSupported() Sam Lantinga <slouken@libsdl.org> parents: 1924 diff changeset	385 if (renderdata->GL_ARB_texture_rectangle_supported) {
307355678142 Added SDL_GL_ExtensionSupported() Sam Lantinga <slouken@libsdl.org> parents: 1924 diff changeset	386 data->type = GL_TEXTURE_RECTANGLE_ARB;
307355678142 Added SDL_GL_ExtensionSupported() Sam Lantinga <slouken@libsdl.org> parents: 1924 diff changeset	387 texture_w = texture->w;
307355678142 Added SDL_GL_ExtensionSupported() Sam Lantinga <slouken@libsdl.org> parents: 1924 diff changeset	388 texture_h = texture->h;
2835 f38257b5d936 Initial pixel shader support for YUV textures in the GL renderer. Ryan C. Gordon <icculus@icculus.org> parents: 2833 diff changeset	389 data->texw = (GLfloat) texture_w;
f38257b5d936 Initial pixel shader support for YUV textures in the GL renderer. Ryan C. Gordon <icculus@icculus.org> parents: 2833 diff changeset	390 data->texh = (GLfloat) texture_h;
1926 307355678142 Added SDL_GL_ExtensionSupported() Sam Lantinga <slouken@libsdl.org> parents: 1924 diff changeset	391 } else {
307355678142 Added SDL_GL_ExtensionSupported() Sam Lantinga <slouken@libsdl.org> parents: 1924 diff changeset	392 data->type = GL_TEXTURE_2D;
307355678142 Added SDL_GL_ExtensionSupported() Sam Lantinga <slouken@libsdl.org> parents: 1924 diff changeset	393 texture_w = power_of_2(texture->w);
307355678142 Added SDL_GL_ExtensionSupported() Sam Lantinga <slouken@libsdl.org> parents: 1924 diff changeset	394 texture_h = power_of_2(texture->h);
2835 f38257b5d936 Initial pixel shader support for YUV textures in the GL renderer. Ryan C. Gordon <icculus@icculus.org> parents: 2833 diff changeset	395 data->texw = (GLfloat) (texture->w) / texture_w;
1926 307355678142 Added SDL_GL_ExtensionSupported() Sam Lantinga <slouken@libsdl.org> parents: 1924 diff changeset	396 data->texh = (GLfloat) texture->h / texture_h;
307355678142 Added SDL_GL_ExtensionSupported() Sam Lantinga <slouken@libsdl.org> parents: 1924 diff changeset	397 }
2835 f38257b5d936 Initial pixel shader support for YUV textures in the GL renderer. Ryan C. Gordon <icculus@icculus.org> parents: 2833 diff changeset	398
1920 8a162bfdc838 Convert SDL_malloc to SDL_calloc if appropriate, slightly faster on operating systems which map the zero page for memory allocations. Sam Lantinga <slouken@libsdl.org> parents: 1919 diff changeset	399 data->format = format;
8a162bfdc838 Convert SDL_malloc to SDL_calloc if appropriate, slightly faster on operating systems which map the zero page for memory allocations. Sam Lantinga <slouken@libsdl.org> parents: 1919 diff changeset	400 data->formattype = type;
2884 9dde605c7540 Date: Fri, 19 Dec 2008 20:17:35 +0100 Sam Lantinga <slouken@libsdl.org> parents: 2858 diff changeset	401 renderdata->glEnable(data->type);
1927 aeb8263d377a OpenGL renderer is feature complete! Sam Lantinga <slouken@libsdl.org> parents: 1926 diff changeset	402 renderdata->glBindTexture(data->type, data->texture);
2230 9b7d29d2432b Optimized OpenGL renderer for Mac OS X. Sam Lantinga <slouken@libsdl.org> parents: 2222 diff changeset	403 renderdata->glTexParameteri(data->type, GL_TEXTURE_MIN_FILTER,
5141 da10636e5eca Making the API simpler, scaling is always defined as linear interpolation and should be supported as much as possible on all renderers. Sam Lantinga <slouken@libsdl.org> parents: 5088 diff changeset	404 GL_LINEAR);
2230 9b7d29d2432b Optimized OpenGL renderer for Mac OS X. Sam Lantinga <slouken@libsdl.org> parents: 2222 diff changeset	405 renderdata->glTexParameteri(data->type, GL_TEXTURE_MAG_FILTER,
5141 da10636e5eca Making the API simpler, scaling is always defined as linear interpolation and should be supported as much as possible on all renderers. Sam Lantinga <slouken@libsdl.org> parents: 5088 diff changeset	406 GL_LINEAR);
2230 9b7d29d2432b Optimized OpenGL renderer for Mac OS X. Sam Lantinga <slouken@libsdl.org> parents: 2222 diff changeset	407 renderdata->glTexParameteri(data->type, GL_TEXTURE_WRAP_S,
9b7d29d2432b Optimized OpenGL renderer for Mac OS X. Sam Lantinga <slouken@libsdl.org> parents: 2222 diff changeset	408 GL_CLAMP_TO_EDGE);
9b7d29d2432b Optimized OpenGL renderer for Mac OS X. Sam Lantinga <slouken@libsdl.org> parents: 2222 diff changeset	409 renderdata->glTexParameteri(data->type, GL_TEXTURE_WRAP_T,
9b7d29d2432b Optimized OpenGL renderer for Mac OS X. Sam Lantinga <slouken@libsdl.org> parents: 2222 diff changeset	410 GL_CLAMP_TO_EDGE);
2840 53ca0d758b0a The previous checkin fixes the crash, so at least we're not overrunning Sam Lantinga <slouken@libsdl.org> parents: 2839 diff changeset	411 #ifdef __MACOSX__
2230 9b7d29d2432b Optimized OpenGL renderer for Mac OS X. Sam Lantinga <slouken@libsdl.org> parents: 2222 diff changeset	412 #ifndef GL_TEXTURE_STORAGE_HINT_APPLE
9b7d29d2432b Optimized OpenGL renderer for Mac OS X. Sam Lantinga <slouken@libsdl.org> parents: 2222 diff changeset	413 #define GL_TEXTURE_STORAGE_HINT_APPLE 0x85BC
9b7d29d2432b Optimized OpenGL renderer for Mac OS X. Sam Lantinga <slouken@libsdl.org> parents: 2222 diff changeset	414 #endif
9b7d29d2432b Optimized OpenGL renderer for Mac OS X. Sam Lantinga <slouken@libsdl.org> parents: 2222 diff changeset	415 #ifndef STORAGE_CACHED_APPLE
9b7d29d2432b Optimized OpenGL renderer for Mac OS X. Sam Lantinga <slouken@libsdl.org> parents: 2222 diff changeset	416 #define STORAGE_CACHED_APPLE 0x85BE
9b7d29d2432b Optimized OpenGL renderer for Mac OS X. Sam Lantinga <slouken@libsdl.org> parents: 2222 diff changeset	417 #endif
9b7d29d2432b Optimized OpenGL renderer for Mac OS X. Sam Lantinga <slouken@libsdl.org> parents: 2222 diff changeset	418 #ifndef STORAGE_SHARED_APPLE
9b7d29d2432b Optimized OpenGL renderer for Mac OS X. Sam Lantinga <slouken@libsdl.org> parents: 2222 diff changeset	419 #define STORAGE_SHARED_APPLE 0x85BF
9b7d29d2432b Optimized OpenGL renderer for Mac OS X. Sam Lantinga <slouken@libsdl.org> parents: 2222 diff changeset	420 #endif
9b7d29d2432b Optimized OpenGL renderer for Mac OS X. Sam Lantinga <slouken@libsdl.org> parents: 2222 diff changeset	421 if (texture->access == SDL_TEXTUREACCESS_STREAMING) {
9b7d29d2432b Optimized OpenGL renderer for Mac OS X. Sam Lantinga <slouken@libsdl.org> parents: 2222 diff changeset	422 renderdata->glTexParameteri(data->type, GL_TEXTURE_STORAGE_HINT_APPLE,
9b7d29d2432b Optimized OpenGL renderer for Mac OS X. Sam Lantinga <slouken@libsdl.org> parents: 2222 diff changeset	423 GL_STORAGE_SHARED_APPLE);
9b7d29d2432b Optimized OpenGL renderer for Mac OS X. Sam Lantinga <slouken@libsdl.org> parents: 2222 diff changeset	424 } else {
9b7d29d2432b Optimized OpenGL renderer for Mac OS X. Sam Lantinga <slouken@libsdl.org> parents: 2222 diff changeset	425 renderdata->glTexParameteri(data->type, GL_TEXTURE_STORAGE_HINT_APPLE,
9b7d29d2432b Optimized OpenGL renderer for Mac OS X. Sam Lantinga <slouken@libsdl.org> parents: 2222 diff changeset	426 GL_STORAGE_CACHED_APPLE);
9b7d29d2432b Optimized OpenGL renderer for Mac OS X. Sam Lantinga <slouken@libsdl.org> parents: 2222 diff changeset	427 }
2295 dbc6d1893869 Checking in Christian Walther's patch for x11 keyboard input. Minor code tweaks by Bob. Bob Pendleton <bob@pendleton.com> parents: 2275 diff changeset	428 if (texture->access == SDL_TEXTUREACCESS_STREAMING
dbc6d1893869 Checking in Christian Walther's patch for x11 keyboard input. Minor code tweaks by Bob. Bob Pendleton <bob@pendleton.com> parents: 2275 diff changeset	429 && texture->format == SDL_PIXELFORMAT_ARGB8888) {
2230 9b7d29d2432b Optimized OpenGL renderer for Mac OS X. Sam Lantinga <slouken@libsdl.org> parents: 2222 diff changeset	430 renderdata->glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_TRUE);
9b7d29d2432b Optimized OpenGL renderer for Mac OS X. Sam Lantinga <slouken@libsdl.org> parents: 2222 diff changeset	431 renderdata->glTexImage2D(data->type, 0, internalFormat, texture_w,
9b7d29d2432b Optimized OpenGL renderer for Mac OS X. Sam Lantinga <slouken@libsdl.org> parents: 2222 diff changeset	432 texture_h, 0, format, type, data->pixels);
5159 307ccc9c135e Made it possible to create a texture of any format, even if not supported by the renderer. Sam Lantinga <slouken@libsdl.org> parents: 5157 diff changeset	433 }
307ccc9c135e Made it possible to create a texture of any format, even if not supported by the renderer. Sam Lantinga <slouken@libsdl.org> parents: 5157 diff changeset	434 else
2809 7e257c3a3bf0 Temporary fix for Mac OS X crash in textoverlay Sam Lantinga <slouken@libsdl.org> parents: 2808 diff changeset	435 #endif
2230 9b7d29d2432b Optimized OpenGL renderer for Mac OS X. Sam Lantinga <slouken@libsdl.org> parents: 2222 diff changeset	436 {
9b7d29d2432b Optimized OpenGL renderer for Mac OS X. Sam Lantinga <slouken@libsdl.org> parents: 2222 diff changeset	437 renderdata->glTexImage2D(data->type, 0, internalFormat, texture_w,
9b7d29d2432b Optimized OpenGL renderer for Mac OS X. Sam Lantinga <slouken@libsdl.org> parents: 2222 diff changeset	438 texture_h, 0, format, type, NULL);
9b7d29d2432b Optimized OpenGL renderer for Mac OS X. Sam Lantinga <slouken@libsdl.org> parents: 2222 diff changeset	439 }
3041 20d65430e63c Fixed OpenGL state issue reported by Dmytro Bogovych Sam Lantinga <slouken@libsdl.org> parents: 3013 diff changeset	440 renderdata->glDisable(data->type);
1927 aeb8263d377a OpenGL renderer is feature complete! Sam Lantinga <slouken@libsdl.org> parents: 1926 diff changeset	441 result = renderdata->glGetError();
1924 69217fdd2c0a If the OpenGL renderer is selected for a non-OpenGL window, recreate the window with OpenGL enabled. Sam Lantinga <slouken@libsdl.org> parents: 1923 diff changeset	442 if (result != GL_NO_ERROR) {
69217fdd2c0a If the OpenGL renderer is selected for a non-OpenGL window, recreate the window with OpenGL enabled. Sam Lantinga <slouken@libsdl.org> parents: 1923 diff changeset	443 GL_SetError("glTexImage2D()", result);
69217fdd2c0a If the OpenGL renderer is selected for a non-OpenGL window, recreate the window with OpenGL enabled. Sam Lantinga <slouken@libsdl.org> parents: 1923 diff changeset	444 return -1;
69217fdd2c0a If the OpenGL renderer is selected for a non-OpenGL window, recreate the window with OpenGL enabled. Sam Lantinga <slouken@libsdl.org> parents: 1923 diff changeset	445 }
1918 092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	446 return 0;
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	447 }
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	448
1924 69217fdd2c0a If the OpenGL renderer is selected for a non-OpenGL window, recreate the window with OpenGL enabled. Sam Lantinga <slouken@libsdl.org> parents: 1923 diff changeset	449 static void
1927 aeb8263d377a OpenGL renderer is feature complete! Sam Lantinga <slouken@libsdl.org> parents: 1926 diff changeset	450 SetupTextureUpdate(GL_RenderData * renderdata, SDL_Texture * texture,
aeb8263d377a OpenGL renderer is feature complete! Sam Lantinga <slouken@libsdl.org> parents: 1926 diff changeset	451 int pitch)
1924 69217fdd2c0a If the OpenGL renderer is selected for a non-OpenGL window, recreate the window with OpenGL enabled. Sam Lantinga <slouken@libsdl.org> parents: 1923 diff changeset	452 {
1927 aeb8263d377a OpenGL renderer is feature complete! Sam Lantinga <slouken@libsdl.org> parents: 1926 diff changeset	453 renderdata->glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
2808 368410632f2d Whoops, we need this for subrect updates (testsprite) Sam Lantinga <slouken@libsdl.org> parents: 2804 diff changeset	454 renderdata->glPixelStorei(GL_UNPACK_ROW_LENGTH,
5159 307ccc9c135e Made it possible to create a texture of any format, even if not supported by the renderer. Sam Lantinga <slouken@libsdl.org> parents: 5157 diff changeset	455 (pitch / SDL_BYTESPERPIXEL(texture->format)));
1924 69217fdd2c0a If the OpenGL renderer is selected for a non-OpenGL window, recreate the window with OpenGL enabled. Sam Lantinga <slouken@libsdl.org> parents: 1923 diff changeset	456 }
69217fdd2c0a If the OpenGL renderer is selected for a non-OpenGL window, recreate the window with OpenGL enabled. Sam Lantinga <slouken@libsdl.org> parents: 1923 diff changeset	457
1918 092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	458 static int
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	459 GL_UpdateTexture(SDL_Renderer * renderer, SDL_Texture * texture,
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	460 const SDL_Rect * rect, const void *pixels, int pitch)
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	461 {
1927 aeb8263d377a OpenGL renderer is feature complete! Sam Lantinga <slouken@libsdl.org> parents: 1926 diff changeset	462 GL_RenderData renderdata = (GL_RenderData ) renderer->driverdata;
1918 092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	463 GL_TextureData data = (GL_TextureData ) texture->driverdata;
1924 69217fdd2c0a If the OpenGL renderer is selected for a non-OpenGL window, recreate the window with OpenGL enabled. Sam Lantinga <slouken@libsdl.org> parents: 1923 diff changeset	464 GLenum result;
1918 092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	465
5150 ad50b3db78bd The rendering functions take a context so it's clear what window they're drawing to. This also potentially opens to the door to multi-threaded rendering in the future. Sam Lantinga <slouken@libsdl.org> parents: 5145 diff changeset	466 GL_ActivateRenderer(renderer);
ad50b3db78bd The rendering functions take a context so it's clear what window they're drawing to. This also potentially opens to the door to multi-threaded rendering in the future. Sam Lantinga <slouken@libsdl.org> parents: 5145 diff changeset	467
1927 aeb8263d377a OpenGL renderer is feature complete! Sam Lantinga <slouken@libsdl.org> parents: 1926 diff changeset	468 renderdata->glGetError();
aeb8263d377a OpenGL renderer is feature complete! Sam Lantinga <slouken@libsdl.org> parents: 1926 diff changeset	469 SetupTextureUpdate(renderdata, texture, pitch);
2884 9dde605c7540 Date: Fri, 19 Dec 2008 20:17:35 +0100 Sam Lantinga <slouken@libsdl.org> parents: 2858 diff changeset	470 renderdata->glEnable(data->type);
1927 aeb8263d377a OpenGL renderer is feature complete! Sam Lantinga <slouken@libsdl.org> parents: 1926 diff changeset	471 renderdata->glBindTexture(data->type, data->texture);
aeb8263d377a OpenGL renderer is feature complete! Sam Lantinga <slouken@libsdl.org> parents: 1926 diff changeset	472 renderdata->glTexSubImage2D(data->type, 0, rect->x, rect->y, rect->w,
aeb8263d377a OpenGL renderer is feature complete! Sam Lantinga <slouken@libsdl.org> parents: 1926 diff changeset	473 rect->h, data->format, data->formattype,
aeb8263d377a OpenGL renderer is feature complete! Sam Lantinga <slouken@libsdl.org> parents: 1926 diff changeset	474 pixels);
3041 20d65430e63c Fixed OpenGL state issue reported by Dmytro Bogovych Sam Lantinga <slouken@libsdl.org> parents: 3013 diff changeset	475 renderdata->glDisable(data->type);
1927 aeb8263d377a OpenGL renderer is feature complete! Sam Lantinga <slouken@libsdl.org> parents: 1926 diff changeset	476 result = renderdata->glGetError();
1924 69217fdd2c0a If the OpenGL renderer is selected for a non-OpenGL window, recreate the window with OpenGL enabled. Sam Lantinga <slouken@libsdl.org> parents: 1923 diff changeset	477 if (result != GL_NO_ERROR) {
69217fdd2c0a If the OpenGL renderer is selected for a non-OpenGL window, recreate the window with OpenGL enabled. Sam Lantinga <slouken@libsdl.org> parents: 1923 diff changeset	478 GL_SetError("glTexSubImage2D()", result);
69217fdd2c0a If the OpenGL renderer is selected for a non-OpenGL window, recreate the window with OpenGL enabled. Sam Lantinga <slouken@libsdl.org> parents: 1923 diff changeset	479 return -1;
69217fdd2c0a If the OpenGL renderer is selected for a non-OpenGL window, recreate the window with OpenGL enabled. Sam Lantinga <slouken@libsdl.org> parents: 1923 diff changeset	480 }
1918 092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	481 return 0;
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	482 }
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	483
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	484 static int
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	485 GL_LockTexture(SDL_Renderer * renderer, SDL_Texture * texture,
5159 307ccc9c135e Made it possible to create a texture of any format, even if not supported by the renderer. Sam Lantinga <slouken@libsdl.org> parents: 5157 diff changeset	486 const SDL_Rect * rect, void *pixels, int pitch)
1918 092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	487 {
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	488 GL_TextureData data = (GL_TextureData ) texture->driverdata;
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	489
1920 8a162bfdc838 Convert SDL_malloc to SDL_calloc if appropriate, slightly faster on operating systems which map the zero page for memory allocations. Sam Lantinga <slouken@libsdl.org> parents: 1919 diff changeset	490 *pixels =
8a162bfdc838 Convert SDL_malloc to SDL_calloc if appropriate, slightly faster on operating systems which map the zero page for memory allocations. Sam Lantinga <slouken@libsdl.org> parents: 1919 diff changeset	491 (void ) ((Uint8 ) data->pixels + rect->y * data->pitch +
5159 307ccc9c135e Made it possible to create a texture of any format, even if not supported by the renderer. Sam Lantinga <slouken@libsdl.org> parents: 5157 diff changeset	492 rect->x * SDL_BYTESPERPIXEL(texture->format));
1920 8a162bfdc838 Convert SDL_malloc to SDL_calloc if appropriate, slightly faster on operating systems which map the zero page for memory allocations. Sam Lantinga <slouken@libsdl.org> parents: 1919 diff changeset	493 *pitch = data->pitch;
1918 092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	494 return 0;
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	495 }
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	496
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	497 static void
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	498 GL_UnlockTexture(SDL_Renderer * renderer, SDL_Texture * texture)
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	499 {
5159 307ccc9c135e Made it possible to create a texture of any format, even if not supported by the renderer. Sam Lantinga <slouken@libsdl.org> parents: 5157 diff changeset	500 GL_RenderData renderdata = (GL_RenderData ) renderer->driverdata;
307ccc9c135e Made it possible to create a texture of any format, even if not supported by the renderer. Sam Lantinga <slouken@libsdl.org> parents: 5157 diff changeset	501 GL_TextureData data = (GL_TextureData ) texture->driverdata;
307ccc9c135e Made it possible to create a texture of any format, even if not supported by the renderer. Sam Lantinga <slouken@libsdl.org> parents: 5157 diff changeset	502
307ccc9c135e Made it possible to create a texture of any format, even if not supported by the renderer. Sam Lantinga <slouken@libsdl.org> parents: 5157 diff changeset	503 GL_ActivateRenderer(renderer);
1918 092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	504
5159 307ccc9c135e Made it possible to create a texture of any format, even if not supported by the renderer. Sam Lantinga <slouken@libsdl.org> parents: 5157 diff changeset	505 SetupTextureUpdate(renderdata, texture, data->pitch);
307ccc9c135e Made it possible to create a texture of any format, even if not supported by the renderer. Sam Lantinga <slouken@libsdl.org> parents: 5157 diff changeset	506 renderdata->glEnable(data->type);
307ccc9c135e Made it possible to create a texture of any format, even if not supported by the renderer. Sam Lantinga <slouken@libsdl.org> parents: 5157 diff changeset	507 renderdata->glBindTexture(data->type, data->texture);
307ccc9c135e Made it possible to create a texture of any format, even if not supported by the renderer. Sam Lantinga <slouken@libsdl.org> parents: 5157 diff changeset	508 renderdata->glTexSubImage2D(data->type, 0, 0, 0, texture->w, texture->h,
307ccc9c135e Made it possible to create a texture of any format, even if not supported by the renderer. Sam Lantinga <slouken@libsdl.org> parents: 5157 diff changeset	509 data->format, data->formattype, data->pixels);
307ccc9c135e Made it possible to create a texture of any format, even if not supported by the renderer. Sam Lantinga <slouken@libsdl.org> parents: 5157 diff changeset	510 renderdata->glDisable(data->type);
1918 092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	511 }
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	512
2936 066384910f50 iPhone build compiles again (drawing routines need to be implemented) Sam Lantinga <slouken@libsdl.org> parents: 2927 diff changeset	513 static void
5143 e743b9c3f6d6 Making the API simpler, the blend modes are "none, blend, add" and are supported by all renderers. Sam Lantinga <slouken@libsdl.org> parents: 5141 diff changeset	514 GL_SetBlendMode(GL_RenderData * data, int blendMode)
2936 066384910f50 iPhone build compiles again (drawing routines need to be implemented) Sam Lantinga <slouken@libsdl.org> parents: 2927 diff changeset	515 {
066384910f50 iPhone build compiles again (drawing routines need to be implemented) Sam Lantinga <slouken@libsdl.org> parents: 2927 diff changeset	516 if (blendMode != data->blendMode) {
066384910f50 iPhone build compiles again (drawing routines need to be implemented) Sam Lantinga <slouken@libsdl.org> parents: 2927 diff changeset	517 switch (blendMode) {
066384910f50 iPhone build compiles again (drawing routines need to be implemented) Sam Lantinga <slouken@libsdl.org> parents: 2927 diff changeset	518 case SDL_BLENDMODE_NONE:
066384910f50 iPhone build compiles again (drawing routines need to be implemented) Sam Lantinga <slouken@libsdl.org> parents: 2927 diff changeset	519 data->glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
066384910f50 iPhone build compiles again (drawing routines need to be implemented) Sam Lantinga <slouken@libsdl.org> parents: 2927 diff changeset	520 data->glDisable(GL_BLEND);
066384910f50 iPhone build compiles again (drawing routines need to be implemented) Sam Lantinga <slouken@libsdl.org> parents: 2927 diff changeset	521 break;
066384910f50 iPhone build compiles again (drawing routines need to be implemented) Sam Lantinga <slouken@libsdl.org> parents: 2927 diff changeset	522 case SDL_BLENDMODE_BLEND:
066384910f50 iPhone build compiles again (drawing routines need to be implemented) Sam Lantinga <slouken@libsdl.org> parents: 2927 diff changeset	523 data->glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
066384910f50 iPhone build compiles again (drawing routines need to be implemented) Sam Lantinga <slouken@libsdl.org> parents: 2927 diff changeset	524 data->glEnable(GL_BLEND);
066384910f50 iPhone build compiles again (drawing routines need to be implemented) Sam Lantinga <slouken@libsdl.org> parents: 2927 diff changeset	525 data->glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
066384910f50 iPhone build compiles again (drawing routines need to be implemented) Sam Lantinga <slouken@libsdl.org> parents: 2927 diff changeset	526 break;
066384910f50 iPhone build compiles again (drawing routines need to be implemented) Sam Lantinga <slouken@libsdl.org> parents: 2927 diff changeset	527 case SDL_BLENDMODE_ADD:
066384910f50 iPhone build compiles again (drawing routines need to be implemented) Sam Lantinga <slouken@libsdl.org> parents: 2927 diff changeset	528 data->glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
066384910f50 iPhone build compiles again (drawing routines need to be implemented) Sam Lantinga <slouken@libsdl.org> parents: 2927 diff changeset	529 data->glEnable(GL_BLEND);
066384910f50 iPhone build compiles again (drawing routines need to be implemented) Sam Lantinga <slouken@libsdl.org> parents: 2927 diff changeset	530 data->glBlendFunc(GL_SRC_ALPHA, GL_ONE);
066384910f50 iPhone build compiles again (drawing routines need to be implemented) Sam Lantinga <slouken@libsdl.org> parents: 2927 diff changeset	531 break;
5187 d976b67150c5 Restored SDL_BLENDMODE_MOD for MAME Sam Lantinga <slouken@libsdl.org> parents: 5169 diff changeset	532 case SDL_BLENDMODE_MOD:
d976b67150c5 Restored SDL_BLENDMODE_MOD for MAME Sam Lantinga <slouken@libsdl.org> parents: 5169 diff changeset	533 data->glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
d976b67150c5 Restored SDL_BLENDMODE_MOD for MAME Sam Lantinga <slouken@libsdl.org> parents: 5169 diff changeset	534 data->glEnable(GL_BLEND);
d976b67150c5 Restored SDL_BLENDMODE_MOD for MAME Sam Lantinga <slouken@libsdl.org> parents: 5169 diff changeset	535 data->glBlendFunc(GL_ZERO, GL_SRC_COLOR);
d976b67150c5 Restored SDL_BLENDMODE_MOD for MAME Sam Lantinga <slouken@libsdl.org> parents: 5169 diff changeset	536 break;
2936 066384910f50 iPhone build compiles again (drawing routines need to be implemented) Sam Lantinga <slouken@libsdl.org> parents: 2927 diff changeset	537 }
066384910f50 iPhone build compiles again (drawing routines need to be implemented) Sam Lantinga <slouken@libsdl.org> parents: 2927 diff changeset	538 data->blendMode = blendMode;
066384910f50 iPhone build compiles again (drawing routines need to be implemented) Sam Lantinga <slouken@libsdl.org> parents: 2927 diff changeset	539 }
066384910f50 iPhone build compiles again (drawing routines need to be implemented) Sam Lantinga <slouken@libsdl.org> parents: 2927 diff changeset	540 }
066384910f50 iPhone build compiles again (drawing routines need to be implemented) Sam Lantinga <slouken@libsdl.org> parents: 2927 diff changeset	541
1918 092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	542 static int
3596 f638ded38b8a Added SDL_RenderClear() as a fast method of clearing the screen to the drawing color. Sam Lantinga <slouken@libsdl.org> parents: 3536 diff changeset	543 GL_RenderClear(SDL_Renderer * renderer)
f638ded38b8a Added SDL_RenderClear() as a fast method of clearing the screen to the drawing color. Sam Lantinga <slouken@libsdl.org> parents: 3536 diff changeset	544 {
f638ded38b8a Added SDL_RenderClear() as a fast method of clearing the screen to the drawing color. Sam Lantinga <slouken@libsdl.org> parents: 3536 diff changeset	545 GL_RenderData data = (GL_RenderData ) renderer->driverdata;
f638ded38b8a Added SDL_RenderClear() as a fast method of clearing the screen to the drawing color. Sam Lantinga <slouken@libsdl.org> parents: 3536 diff changeset	546
5150 ad50b3db78bd The rendering functions take a context so it's clear what window they're drawing to. This also potentially opens to the door to multi-threaded rendering in the future. Sam Lantinga <slouken@libsdl.org> parents: 5145 diff changeset	547 GL_ActivateRenderer(renderer);
ad50b3db78bd The rendering functions take a context so it's clear what window they're drawing to. This also potentially opens to the door to multi-threaded rendering in the future. Sam Lantinga <slouken@libsdl.org> parents: 5145 diff changeset	548
3596 f638ded38b8a Added SDL_RenderClear() as a fast method of clearing the screen to the drawing color. Sam Lantinga <slouken@libsdl.org> parents: 3536 diff changeset	549 data->glClearColor((GLfloat) renderer->r * inv255f,
f638ded38b8a Added SDL_RenderClear() as a fast method of clearing the screen to the drawing color. Sam Lantinga <slouken@libsdl.org> parents: 3536 diff changeset	550 (GLfloat) renderer->g * inv255f,
f638ded38b8a Added SDL_RenderClear() as a fast method of clearing the screen to the drawing color. Sam Lantinga <slouken@libsdl.org> parents: 3536 diff changeset	551 (GLfloat) renderer->b * inv255f,
f638ded38b8a Added SDL_RenderClear() as a fast method of clearing the screen to the drawing color. Sam Lantinga <slouken@libsdl.org> parents: 3536 diff changeset	552 (GLfloat) renderer->a * inv255f);
f638ded38b8a Added SDL_RenderClear() as a fast method of clearing the screen to the drawing color. Sam Lantinga <slouken@libsdl.org> parents: 3536 diff changeset	553
f638ded38b8a Added SDL_RenderClear() as a fast method of clearing the screen to the drawing color. Sam Lantinga <slouken@libsdl.org> parents: 3536 diff changeset	554 data->glClear(GL_COLOR_BUFFER_BIT);
f638ded38b8a Added SDL_RenderClear() as a fast method of clearing the screen to the drawing color. Sam Lantinga <slouken@libsdl.org> parents: 3536 diff changeset	555
f638ded38b8a Added SDL_RenderClear() as a fast method of clearing the screen to the drawing color. Sam Lantinga <slouken@libsdl.org> parents: 3536 diff changeset	556 return 0;
f638ded38b8a Added SDL_RenderClear() as a fast method of clearing the screen to the drawing color. Sam Lantinga <slouken@libsdl.org> parents: 3536 diff changeset	557 }
f638ded38b8a Added SDL_RenderClear() as a fast method of clearing the screen to the drawing color. Sam Lantinga <slouken@libsdl.org> parents: 3536 diff changeset	558
f638ded38b8a Added SDL_RenderClear() as a fast method of clearing the screen to the drawing color. Sam Lantinga <slouken@libsdl.org> parents: 3536 diff changeset	559 static int
f638ded38b8a Added SDL_RenderClear() as a fast method of clearing the screen to the drawing color. Sam Lantinga <slouken@libsdl.org> parents: 3536 diff changeset	560 GL_RenderDrawPoints(SDL_Renderer * renderer, const SDL_Point * points,
f638ded38b8a Added SDL_RenderClear() as a fast method of clearing the screen to the drawing color. Sam Lantinga <slouken@libsdl.org> parents: 3536 diff changeset	561 int count)
2884 9dde605c7540 Date: Fri, 19 Dec 2008 20:17:35 +0100 Sam Lantinga <slouken@libsdl.org> parents: 2858 diff changeset	562 {
9dde605c7540 Date: Fri, 19 Dec 2008 20:17:35 +0100 Sam Lantinga <slouken@libsdl.org> parents: 2858 diff changeset	563 GL_RenderData data = (GL_RenderData ) renderer->driverdata;
3536 0267b8b1595c Added interfaces for batch drawing of points, lines and rects: Sam Lantinga <slouken@libsdl.org> parents: 3533 diff changeset	564 int i;
2884 9dde605c7540 Date: Fri, 19 Dec 2008 20:17:35 +0100 Sam Lantinga <slouken@libsdl.org> parents: 2858 diff changeset	565
5150 ad50b3db78bd The rendering functions take a context so it's clear what window they're drawing to. This also potentially opens to the door to multi-threaded rendering in the future. Sam Lantinga <slouken@libsdl.org> parents: 5145 diff changeset	566 GL_ActivateRenderer(renderer);
ad50b3db78bd The rendering functions take a context so it's clear what window they're drawing to. This also potentially opens to the door to multi-threaded rendering in the future. Sam Lantinga <slouken@libsdl.org> parents: 5145 diff changeset	567
5143 e743b9c3f6d6 Making the API simpler, the blend modes are "none, blend, add" and are supported by all renderers. Sam Lantinga <slouken@libsdl.org> parents: 5141 diff changeset	568 GL_SetBlendMode(data, renderer->blendMode);
2884 9dde605c7540 Date: Fri, 19 Dec 2008 20:17:35 +0100 Sam Lantinga <slouken@libsdl.org> parents: 2858 diff changeset	569
9dde605c7540 Date: Fri, 19 Dec 2008 20:17:35 +0100 Sam Lantinga <slouken@libsdl.org> parents: 2858 diff changeset	570 data->glColor4f((GLfloat) renderer->r * inv255f,
9dde605c7540 Date: Fri, 19 Dec 2008 20:17:35 +0100 Sam Lantinga <slouken@libsdl.org> parents: 2858 diff changeset	571 (GLfloat) renderer->g * inv255f,
9dde605c7540 Date: Fri, 19 Dec 2008 20:17:35 +0100 Sam Lantinga <slouken@libsdl.org> parents: 2858 diff changeset	572 (GLfloat) renderer->b * inv255f,
9dde605c7540 Date: Fri, 19 Dec 2008 20:17:35 +0100 Sam Lantinga <slouken@libsdl.org> parents: 2858 diff changeset	573 (GLfloat) renderer->a * inv255f);
9dde605c7540 Date: Fri, 19 Dec 2008 20:17:35 +0100 Sam Lantinga <slouken@libsdl.org> parents: 2858 diff changeset	574
2901 133601e3b255 Added RenderPiont() API Sam Lantinga <slouken@libsdl.org> parents: 2893 diff changeset	575 data->glBegin(GL_POINTS);
3536 0267b8b1595c Added interfaces for batch drawing of points, lines and rects: Sam Lantinga <slouken@libsdl.org> parents: 3533 diff changeset	576 for (i = 0; i < count; ++i) {
0267b8b1595c Added interfaces for batch drawing of points, lines and rects: Sam Lantinga <slouken@libsdl.org> parents: 3533 diff changeset	577 data->glVertex2f(0.5f + points[i].x, 0.5f + points[i].y);
0267b8b1595c Added interfaces for batch drawing of points, lines and rects: Sam Lantinga <slouken@libsdl.org> parents: 3533 diff changeset	578 }
2901 133601e3b255 Added RenderPiont() API Sam Lantinga <slouken@libsdl.org> parents: 2893 diff changeset	579 data->glEnd();
133601e3b255 Added RenderPiont() API Sam Lantinga <slouken@libsdl.org> parents: 2893 diff changeset	580
133601e3b255 Added RenderPiont() API Sam Lantinga <slouken@libsdl.org> parents: 2893 diff changeset	581 return 0;
133601e3b255 Added RenderPiont() API Sam Lantinga <slouken@libsdl.org> parents: 2893 diff changeset	582 }
133601e3b255 Added RenderPiont() API Sam Lantinga <slouken@libsdl.org> parents: 2893 diff changeset	583
133601e3b255 Added RenderPiont() API Sam Lantinga <slouken@libsdl.org> parents: 2893 diff changeset	584 static int
3596 f638ded38b8a Added SDL_RenderClear() as a fast method of clearing the screen to the drawing color. Sam Lantinga <slouken@libsdl.org> parents: 3536 diff changeset	585 GL_RenderDrawLines(SDL_Renderer * renderer, const SDL_Point * points,
f638ded38b8a Added SDL_RenderClear() as a fast method of clearing the screen to the drawing color. Sam Lantinga <slouken@libsdl.org> parents: 3536 diff changeset	586 int count)
2901 133601e3b255 Added RenderPiont() API Sam Lantinga <slouken@libsdl.org> parents: 2893 diff changeset	587 {
133601e3b255 Added RenderPiont() API Sam Lantinga <slouken@libsdl.org> parents: 2893 diff changeset	588 GL_RenderData data = (GL_RenderData ) renderer->driverdata;
3536 0267b8b1595c Added interfaces for batch drawing of points, lines and rects: Sam Lantinga <slouken@libsdl.org> parents: 3533 diff changeset	589 int i;
2901 133601e3b255 Added RenderPiont() API Sam Lantinga <slouken@libsdl.org> parents: 2893 diff changeset	590
5150 ad50b3db78bd The rendering functions take a context so it's clear what window they're drawing to. This also potentially opens to the door to multi-threaded rendering in the future. Sam Lantinga <slouken@libsdl.org> parents: 5145 diff changeset	591 GL_ActivateRenderer(renderer);
ad50b3db78bd The rendering functions take a context so it's clear what window they're drawing to. This also potentially opens to the door to multi-threaded rendering in the future. Sam Lantinga <slouken@libsdl.org> parents: 5145 diff changeset	592
5143 e743b9c3f6d6 Making the API simpler, the blend modes are "none, blend, add" and are supported by all renderers. Sam Lantinga <slouken@libsdl.org> parents: 5141 diff changeset	593 GL_SetBlendMode(data, renderer->blendMode);
2901 133601e3b255 Added RenderPiont() API Sam Lantinga <slouken@libsdl.org> parents: 2893 diff changeset	594
133601e3b255 Added RenderPiont() API Sam Lantinga <slouken@libsdl.org> parents: 2893 diff changeset	595 data->glColor4f((GLfloat) renderer->r * inv255f,
133601e3b255 Added RenderPiont() API Sam Lantinga <slouken@libsdl.org> parents: 2893 diff changeset	596 (GLfloat) renderer->g * inv255f,
133601e3b255 Added RenderPiont() API Sam Lantinga <slouken@libsdl.org> parents: 2893 diff changeset	597 (GLfloat) renderer->b * inv255f,
133601e3b255 Added RenderPiont() API Sam Lantinga <slouken@libsdl.org> parents: 2893 diff changeset	598 (GLfloat) renderer->a * inv255f);
133601e3b255 Added RenderPiont() API Sam Lantinga <slouken@libsdl.org> parents: 2893 diff changeset	599
3536 0267b8b1595c Added interfaces for batch drawing of points, lines and rects: Sam Lantinga <slouken@libsdl.org> parents: 3533 diff changeset	600 if (count > 2 &&
0267b8b1595c Added interfaces for batch drawing of points, lines and rects: Sam Lantinga <slouken@libsdl.org> parents: 3533 diff changeset	601 points[0].x == points[count-1].x && points[0].y == points[count-1].y) {
0267b8b1595c Added interfaces for batch drawing of points, lines and rects: Sam Lantinga <slouken@libsdl.org> parents: 3533 diff changeset	602 data->glBegin(GL_LINE_LOOP);
0267b8b1595c Added interfaces for batch drawing of points, lines and rects: Sam Lantinga <slouken@libsdl.org> parents: 3533 diff changeset	603 /* GL_LINE_LOOP takes care of the final segment */
0267b8b1595c Added interfaces for batch drawing of points, lines and rects: Sam Lantinga <slouken@libsdl.org> parents: 3533 diff changeset	604 --count;
0267b8b1595c Added interfaces for batch drawing of points, lines and rects: Sam Lantinga <slouken@libsdl.org> parents: 3533 diff changeset	605 for (i = 0; i < count; ++i) {
0267b8b1595c Added interfaces for batch drawing of points, lines and rects: Sam Lantinga <slouken@libsdl.org> parents: 3533 diff changeset	606 data->glVertex2f(0.5f + points[i].x, 0.5f + points[i].y);
0267b8b1595c Added interfaces for batch drawing of points, lines and rects: Sam Lantinga <slouken@libsdl.org> parents: 3533 diff changeset	607 }
0267b8b1595c Added interfaces for batch drawing of points, lines and rects: Sam Lantinga <slouken@libsdl.org> parents: 3533 diff changeset	608 data->glEnd();
0267b8b1595c Added interfaces for batch drawing of points, lines and rects: Sam Lantinga <slouken@libsdl.org> parents: 3533 diff changeset	609 } else {
5088 c2539ff054c8 Fixed compiling on Windows Mobile SDK 5.0 with Visual Studio 2008 Sam Lantinga <slouken@libsdl.org> parents: 5062 diff changeset	610 #if defined(__APPLE__) \|\| defined(__WIN32__)
4910 f205711f73d5 Fix and rename VS2010 project files, add tests to VS2010 solution, fix VS compiler warning Andreas Schiffler <aschiffler@ferzkopp.net> parents: 4905 diff changeset	611 #else
4905 9779093454d2 This fixes SDL_renderer_gl so that it builds with c89. Sam Lantinga <slouken@libsdl.org> parents: 4455 diff changeset	612 int x1, y1, x2, y2;
4910 f205711f73d5 Fix and rename VS2010 project files, add tests to VS2010 solution, fix VS compiler warning Andreas Schiffler <aschiffler@ferzkopp.net> parents: 4905 diff changeset	613 #endif
4905 9779093454d2 This fixes SDL_renderer_gl so that it builds with c89. Sam Lantinga <slouken@libsdl.org> parents: 4455 diff changeset	614
3536 0267b8b1595c Added interfaces for batch drawing of points, lines and rects: Sam Lantinga <slouken@libsdl.org> parents: 3533 diff changeset	615 data->glBegin(GL_LINE_STRIP);
0267b8b1595c Added interfaces for batch drawing of points, lines and rects: Sam Lantinga <slouken@libsdl.org> parents: 3533 diff changeset	616 for (i = 0; i < count; ++i) {
0267b8b1595c Added interfaces for batch drawing of points, lines and rects: Sam Lantinga <slouken@libsdl.org> parents: 3533 diff changeset	617 data->glVertex2f(0.5f + points[i].x, 0.5f + points[i].y);
0267b8b1595c Added interfaces for batch drawing of points, lines and rects: Sam Lantinga <slouken@libsdl.org> parents: 3533 diff changeset	618 }
0267b8b1595c Added interfaces for batch drawing of points, lines and rects: Sam Lantinga <slouken@libsdl.org> parents: 3533 diff changeset	619 data->glEnd();
3474 1edb86163d62 Of COURSE that trick wouldn't work on all renderers. Fall back to something for now, hopefully figure out a better way to do this later. Sam Lantinga <slouken@libsdl.org> parents: 3473 diff changeset	620
3536 0267b8b1595c Added interfaces for batch drawing of points, lines and rects: Sam Lantinga <slouken@libsdl.org> parents: 3533 diff changeset	621 /* The line is half open, so we need one more point to complete it.
0267b8b1595c Added interfaces for batch drawing of points, lines and rects: Sam Lantinga <slouken@libsdl.org> parents: 3533 diff changeset	622 * http://www.opengl.org/documentation/specs/version1.1/glspec1.1/node47.html
0267b8b1595c Added interfaces for batch drawing of points, lines and rects: Sam Lantinga <slouken@libsdl.org> parents: 3533 diff changeset	623 * If we have to, we can use vertical line and horizontal line textures
0267b8b1595c Added interfaces for batch drawing of points, lines and rects: Sam Lantinga <slouken@libsdl.org> parents: 3533 diff changeset	624 * for vertical and horizontal lines, and then create custom textures
0267b8b1595c Added interfaces for batch drawing of points, lines and rects: Sam Lantinga <slouken@libsdl.org> parents: 3533 diff changeset	625 * for diagonal lines and software render those. It's terrible, but at
0267b8b1595c Added interfaces for batch drawing of points, lines and rects: Sam Lantinga <slouken@libsdl.org> parents: 3533 diff changeset	626 * least it would be pixel perfect.
0267b8b1595c Added interfaces for batch drawing of points, lines and rects: Sam Lantinga <slouken@libsdl.org> parents: 3533 diff changeset	627 */
0267b8b1595c Added interfaces for batch drawing of points, lines and rects: Sam Lantinga <slouken@libsdl.org> parents: 3533 diff changeset	628 data->glBegin(GL_POINTS);
5088 c2539ff054c8 Fixed compiling on Windows Mobile SDK 5.0 with Visual Studio 2008 Sam Lantinga <slouken@libsdl.org> parents: 5062 diff changeset	629 #if defined(__APPLE__) \|\| defined(__WIN32__)
3536 0267b8b1595c Added interfaces for batch drawing of points, lines and rects: Sam Lantinga <slouken@libsdl.org> parents: 3533 diff changeset	630 /* Mac OS X and Windows seem to always leave the second point open */
0267b8b1595c Added interfaces for batch drawing of points, lines and rects: Sam Lantinga <slouken@libsdl.org> parents: 3533 diff changeset	631 data->glVertex2f(0.5f + points[count-1].x, 0.5f + points[count-1].y);
3474 1edb86163d62 Of COURSE that trick wouldn't work on all renderers. Fall back to something for now, hopefully figure out a better way to do this later. Sam Lantinga <slouken@libsdl.org> parents: 3473 diff changeset	632 #else
3536 0267b8b1595c Added interfaces for batch drawing of points, lines and rects: Sam Lantinga <slouken@libsdl.org> parents: 3533 diff changeset	633 /* Linux seems to leave the right-most or bottom-most point open */
4905 9779093454d2 This fixes SDL_renderer_gl so that it builds with c89. Sam Lantinga <slouken@libsdl.org> parents: 4455 diff changeset	634 x1 = points[0].x;
9779093454d2 This fixes SDL_renderer_gl so that it builds with c89. Sam Lantinga <slouken@libsdl.org> parents: 4455 diff changeset	635 y1 = points[0].y;
9779093454d2 This fixes SDL_renderer_gl so that it builds with c89. Sam Lantinga <slouken@libsdl.org> parents: 4455 diff changeset	636 x2 = points[count-1].x;
9779093454d2 This fixes SDL_renderer_gl so that it builds with c89. Sam Lantinga <slouken@libsdl.org> parents: 4455 diff changeset	637 y2 = points[count-1].y;
3536 0267b8b1595c Added interfaces for batch drawing of points, lines and rects: Sam Lantinga <slouken@libsdl.org> parents: 3533 diff changeset	638
0267b8b1595c Added interfaces for batch drawing of points, lines and rects: Sam Lantinga <slouken@libsdl.org> parents: 3533 diff changeset	639 if (x1 > x2) {
0267b8b1595c Added interfaces for batch drawing of points, lines and rects: Sam Lantinga <slouken@libsdl.org> parents: 3533 diff changeset	640 data->glVertex2f(0.5f + x1, 0.5f + y1);
0267b8b1595c Added interfaces for batch drawing of points, lines and rects: Sam Lantinga <slouken@libsdl.org> parents: 3533 diff changeset	641 } else if (x2 > x1) {
0267b8b1595c Added interfaces for batch drawing of points, lines and rects: Sam Lantinga <slouken@libsdl.org> parents: 3533 diff changeset	642 data->glVertex2f(0.5f + x2, 0.5f + y2);
0267b8b1595c Added interfaces for batch drawing of points, lines and rects: Sam Lantinga <slouken@libsdl.org> parents: 3533 diff changeset	643 } else if (y1 > y2) {
0267b8b1595c Added interfaces for batch drawing of points, lines and rects: Sam Lantinga <slouken@libsdl.org> parents: 3533 diff changeset	644 data->glVertex2f(0.5f + x1, 0.5f + y1);
0267b8b1595c Added interfaces for batch drawing of points, lines and rects: Sam Lantinga <slouken@libsdl.org> parents: 3533 diff changeset	645 } else if (y2 > y1) {
0267b8b1595c Added interfaces for batch drawing of points, lines and rects: Sam Lantinga <slouken@libsdl.org> parents: 3533 diff changeset	646 data->glVertex2f(0.5f + x2, 0.5f + y2);
0267b8b1595c Added interfaces for batch drawing of points, lines and rects: Sam Lantinga <slouken@libsdl.org> parents: 3533 diff changeset	647 }
0267b8b1595c Added interfaces for batch drawing of points, lines and rects: Sam Lantinga <slouken@libsdl.org> parents: 3533 diff changeset	648 #endif
0267b8b1595c Added interfaces for batch drawing of points, lines and rects: Sam Lantinga <slouken@libsdl.org> parents: 3533 diff changeset	649 data->glEnd();
3474 1edb86163d62 Of COURSE that trick wouldn't work on all renderers. Fall back to something for now, hopefully figure out a better way to do this later. Sam Lantinga <slouken@libsdl.org> parents: 3473 diff changeset	650 }
3455 5a7b5760c875 Include the endpoint in the line we're drawing Sam Lantinga <slouken@libsdl.org> parents: 3454 diff changeset	651
1918 092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	652 return 0;
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	653 }
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	654
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	655 static int
3596 f638ded38b8a Added SDL_RenderClear() as a fast method of clearing the screen to the drawing color. Sam Lantinga <slouken@libsdl.org> parents: 3536 diff changeset	656 GL_RenderFillRects(SDL_Renderer * renderer, const SDL_Rect ** rects, int count)
2925 7e21f7662208 Swapped functions to match the other renderer files Sam Lantinga <slouken@libsdl.org> parents: 2922 diff changeset	657 {
7e21f7662208 Swapped functions to match the other renderer files Sam Lantinga <slouken@libsdl.org> parents: 2922 diff changeset	658 GL_RenderData data = (GL_RenderData ) renderer->driverdata;
3536 0267b8b1595c Added interfaces for batch drawing of points, lines and rects: Sam Lantinga <slouken@libsdl.org> parents: 3533 diff changeset	659 int i;
2925 7e21f7662208 Swapped functions to match the other renderer files Sam Lantinga <slouken@libsdl.org> parents: 2922 diff changeset	660
5150 ad50b3db78bd The rendering functions take a context so it's clear what window they're drawing to. This also potentially opens to the door to multi-threaded rendering in the future. Sam Lantinga <slouken@libsdl.org> parents: 5145 diff changeset	661 GL_ActivateRenderer(renderer);
ad50b3db78bd The rendering functions take a context so it's clear what window they're drawing to. This also potentially opens to the door to multi-threaded rendering in the future. Sam Lantinga <slouken@libsdl.org> parents: 5145 diff changeset	662
5143 e743b9c3f6d6 Making the API simpler, the blend modes are "none, blend, add" and are supported by all renderers. Sam Lantinga <slouken@libsdl.org> parents: 5141 diff changeset	663 GL_SetBlendMode(data, renderer->blendMode);
2936 066384910f50 iPhone build compiles again (drawing routines need to be implemented) Sam Lantinga <slouken@libsdl.org> parents: 2927 diff changeset	664
2925 7e21f7662208 Swapped functions to match the other renderer files Sam Lantinga <slouken@libsdl.org> parents: 2922 diff changeset	665 data->glColor4f((GLfloat) renderer->r * inv255f,
7e21f7662208 Swapped functions to match the other renderer files Sam Lantinga <slouken@libsdl.org> parents: 2922 diff changeset	666 (GLfloat) renderer->g * inv255f,
7e21f7662208 Swapped functions to match the other renderer files Sam Lantinga <slouken@libsdl.org> parents: 2922 diff changeset	667 (GLfloat) renderer->b * inv255f,
7e21f7662208 Swapped functions to match the other renderer files Sam Lantinga <slouken@libsdl.org> parents: 2922 diff changeset	668 (GLfloat) renderer->a * inv255f);
2936 066384910f50 iPhone build compiles again (drawing routines need to be implemented) Sam Lantinga <slouken@libsdl.org> parents: 2927 diff changeset	669
3536 0267b8b1595c Added interfaces for batch drawing of points, lines and rects: Sam Lantinga <slouken@libsdl.org> parents: 3533 diff changeset	670 for (i = 0; i < count; ++i) {
0267b8b1595c Added interfaces for batch drawing of points, lines and rects: Sam Lantinga <slouken@libsdl.org> parents: 3533 diff changeset	671 const SDL_Rect *rect = rects[i];
0267b8b1595c Added interfaces for batch drawing of points, lines and rects: Sam Lantinga <slouken@libsdl.org> parents: 3533 diff changeset	672
0267b8b1595c Added interfaces for batch drawing of points, lines and rects: Sam Lantinga <slouken@libsdl.org> parents: 3533 diff changeset	673 data->glRecti(rect->x, rect->y, rect->x + rect->w, rect->y + rect->h);
0267b8b1595c Added interfaces for batch drawing of points, lines and rects: Sam Lantinga <slouken@libsdl.org> parents: 3533 diff changeset	674 }
2925 7e21f7662208 Swapped functions to match the other renderer files Sam Lantinga <slouken@libsdl.org> parents: 2922 diff changeset	675
7e21f7662208 Swapped functions to match the other renderer files Sam Lantinga <slouken@libsdl.org> parents: 2922 diff changeset	676 return 0;
7e21f7662208 Swapped functions to match the other renderer files Sam Lantinga <slouken@libsdl.org> parents: 2922 diff changeset	677 }
7e21f7662208 Swapped functions to match the other renderer files Sam Lantinga <slouken@libsdl.org> parents: 2922 diff changeset	678
7e21f7662208 Swapped functions to match the other renderer files Sam Lantinga <slouken@libsdl.org> parents: 2922 diff changeset	679 static int
1918 092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	680 GL_RenderCopy(SDL_Renderer * renderer, SDL_Texture * texture,
1985 8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1975 diff changeset	681 const SDL_Rect * srcrect, const SDL_Rect * dstrect)
1918 092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	682 {
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	683 GL_RenderData data = (GL_RenderData ) renderer->driverdata;
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	684 GL_TextureData texturedata = (GL_TextureData ) texture->driverdata;
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	685 int minx, miny, maxx, maxy;
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	686 GLfloat minu, maxu, minv, maxv;
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	687
5150 ad50b3db78bd The rendering functions take a context so it's clear what window they're drawing to. This also potentially opens to the door to multi-threaded rendering in the future. Sam Lantinga <slouken@libsdl.org> parents: 5145 diff changeset	688 GL_ActivateRenderer(renderer);
ad50b3db78bd The rendering functions take a context so it's clear what window they're drawing to. This also potentially opens to the door to multi-threaded rendering in the future. Sam Lantinga <slouken@libsdl.org> parents: 5145 diff changeset	689
1918 092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	690 minx = dstrect->x;
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	691 miny = dstrect->y;
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	692 maxx = dstrect->x + dstrect->w;
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	693 maxy = dstrect->y + dstrect->h;
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	694
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	695 minu = (GLfloat) srcrect->x / texture->w;
1920 8a162bfdc838 Convert SDL_malloc to SDL_calloc if appropriate, slightly faster on operating systems which map the zero page for memory allocations. Sam Lantinga <slouken@libsdl.org> parents: 1919 diff changeset	696 minu *= texturedata->texw;
1918 092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	697 maxu = (GLfloat) (srcrect->x + srcrect->w) / texture->w;
1920 8a162bfdc838 Convert SDL_malloc to SDL_calloc if appropriate, slightly faster on operating systems which map the zero page for memory allocations. Sam Lantinga <slouken@libsdl.org> parents: 1919 diff changeset	698 maxu *= texturedata->texw;
1918 092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	699 minv = (GLfloat) srcrect->y / texture->h;
1920 8a162bfdc838 Convert SDL_malloc to SDL_calloc if appropriate, slightly faster on operating systems which map the zero page for memory allocations. Sam Lantinga <slouken@libsdl.org> parents: 1919 diff changeset	700 minv *= texturedata->texh;
1918 092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	701 maxv = (GLfloat) (srcrect->y + srcrect->h) / texture->h;
1920 8a162bfdc838 Convert SDL_malloc to SDL_calloc if appropriate, slightly faster on operating systems which map the zero page for memory allocations. Sam Lantinga <slouken@libsdl.org> parents: 1919 diff changeset	702 maxv *= texturedata->texh;
1918 092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	703
2884 9dde605c7540 Date: Fri, 19 Dec 2008 20:17:35 +0100 Sam Lantinga <slouken@libsdl.org> parents: 2858 diff changeset	704 data->glEnable(texturedata->type);
1927 aeb8263d377a OpenGL renderer is feature complete! Sam Lantinga <slouken@libsdl.org> parents: 1926 diff changeset	705 data->glBindTexture(texturedata->type, texturedata->texture);
1918 092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	706
1985 8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1975 diff changeset	707 if (texture->modMode) {
8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1975 diff changeset	708 data->glColor4f((GLfloat) texture->r * inv255f,
8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1975 diff changeset	709 (GLfloat) texture->g * inv255f,
8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1975 diff changeset	710 (GLfloat) texture->b * inv255f,
8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1975 diff changeset	711 (GLfloat) texture->a * inv255f);
8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1975 diff changeset	712 } else {
8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1975 diff changeset	713 data->glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1975 diff changeset	714 }
8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1975 diff changeset	715
5143 e743b9c3f6d6 Making the API simpler, the blend modes are "none, blend, add" and are supported by all renderers. Sam Lantinga <slouken@libsdl.org> parents: 5141 diff changeset	716 GL_SetBlendMode(data, texture->blendMode);
1918 092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	717
1927 aeb8263d377a OpenGL renderer is feature complete! Sam Lantinga <slouken@libsdl.org> parents: 1926 diff changeset	718 data->glBegin(GL_TRIANGLE_STRIP);
aeb8263d377a OpenGL renderer is feature complete! Sam Lantinga <slouken@libsdl.org> parents: 1926 diff changeset	719 data->glTexCoord2f(minu, minv);
3472 fdd2f2e9cd97 Fixed the coordinates for pixel coverage in blits Sam Lantinga <slouken@libsdl.org> parents: 3470 diff changeset	720 data->glVertex2f((GLfloat) minx, (GLfloat) miny);
1927 aeb8263d377a OpenGL renderer is feature complete! Sam Lantinga <slouken@libsdl.org> parents: 1926 diff changeset	721 data->glTexCoord2f(maxu, minv);
3472 fdd2f2e9cd97 Fixed the coordinates for pixel coverage in blits Sam Lantinga <slouken@libsdl.org> parents: 3470 diff changeset	722 data->glVertex2f((GLfloat) maxx, (GLfloat) miny);
1927 aeb8263d377a OpenGL renderer is feature complete! Sam Lantinga <slouken@libsdl.org> parents: 1926 diff changeset	723 data->glTexCoord2f(minu, maxv);
3472 fdd2f2e9cd97 Fixed the coordinates for pixel coverage in blits Sam Lantinga <slouken@libsdl.org> parents: 3470 diff changeset	724 data->glVertex2f((GLfloat) minx, (GLfloat) maxy);
1927 aeb8263d377a OpenGL renderer is feature complete! Sam Lantinga <slouken@libsdl.org> parents: 1926 diff changeset	725 data->glTexCoord2f(maxu, maxv);
3472 fdd2f2e9cd97 Fixed the coordinates for pixel coverage in blits Sam Lantinga <slouken@libsdl.org> parents: 3470 diff changeset	726 data->glVertex2f((GLfloat) maxx, (GLfloat) maxy);
1927 aeb8263d377a OpenGL renderer is feature complete! Sam Lantinga <slouken@libsdl.org> parents: 1926 diff changeset	727 data->glEnd();
1918 092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	728
2884 9dde605c7540 Date: Fri, 19 Dec 2008 20:17:35 +0100 Sam Lantinga <slouken@libsdl.org> parents: 2858 diff changeset	729 data->glDisable(texturedata->type);
9dde605c7540 Date: Fri, 19 Dec 2008 20:17:35 +0100 Sam Lantinga <slouken@libsdl.org> parents: 2858 diff changeset	730
1918 092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	731 return 0;
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	732 }
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	733
3431 c8fbb27627d9 Work in progress on OpenGL ReadPixels/WritePixels interface Sam Lantinga <slouken@libsdl.org> parents: 3393 diff changeset	734 static int
c8fbb27627d9 Work in progress on OpenGL ReadPixels/WritePixels interface Sam Lantinga <slouken@libsdl.org> parents: 3393 diff changeset	735 GL_RenderReadPixels(SDL_Renderer * renderer, const SDL_Rect * rect,
3435 9f62f47d989b You can specify the format for pixel data in SDL_RenderReadPixels() and SDL_RenderWritePixels() Sam Lantinga <slouken@libsdl.org> parents: 3433 diff changeset	736 Uint32 pixel_format, void * pixels, int pitch)
3431 c8fbb27627d9 Work in progress on OpenGL ReadPixels/WritePixels interface Sam Lantinga <slouken@libsdl.org> parents: 3393 diff changeset	737 {
3433 ad845d9835aa Hmm, this isn't going to work, is it? Sam Lantinga <slouken@libsdl.org> parents: 3431 diff changeset	738 GL_RenderData data = (GL_RenderData ) renderer->driverdata;
3685 64ce267332c6 Switched from SDL_WindowID and SDL_TextureID to SDL_Window* and SDL_Texture* for code simplicity and improved performance. Sam Lantinga <slouken@libsdl.org> parents: 3607 diff changeset	739 SDL_Window *window = renderer->window;
3433 ad845d9835aa Hmm, this isn't going to work, is it? Sam Lantinga <slouken@libsdl.org> parents: 3431 diff changeset	740 GLint internalFormat;
ad845d9835aa Hmm, this isn't going to work, is it? Sam Lantinga <slouken@libsdl.org> parents: 3431 diff changeset	741 GLenum format, type;
3435 9f62f47d989b You can specify the format for pixel data in SDL_RenderReadPixels() and SDL_RenderWritePixels() Sam Lantinga <slouken@libsdl.org> parents: 3433 diff changeset	742 Uint8 src, dst, *tmp;
5157 fb424691cfc7 Moved the rendering code out to a separate directory in the hope that it can someday be completely decoupled from the rest of the library and be expanded to an awesome 2D on 3D library. Sam Lantinga <slouken@libsdl.org> parents: 5153 diff changeset	743 int w, h, length, rows;
3433 ad845d9835aa Hmm, this isn't going to work, is it? Sam Lantinga <slouken@libsdl.org> parents: 3431 diff changeset	744
5150 ad50b3db78bd The rendering functions take a context so it's clear what window they're drawing to. This also potentially opens to the door to multi-threaded rendering in the future. Sam Lantinga <slouken@libsdl.org> parents: 5145 diff changeset	745 GL_ActivateRenderer(renderer);
ad50b3db78bd The rendering functions take a context so it's clear what window they're drawing to. This also potentially opens to the door to multi-threaded rendering in the future. Sam Lantinga <slouken@libsdl.org> parents: 5145 diff changeset	746
3433 ad845d9835aa Hmm, this isn't going to work, is it? Sam Lantinga <slouken@libsdl.org> parents: 3431 diff changeset	747 if (!convert_format(data, pixel_format, &internalFormat, &format, &type)) {
3435 9f62f47d989b You can specify the format for pixel data in SDL_RenderReadPixels() and SDL_RenderWritePixels() Sam Lantinga <slouken@libsdl.org> parents: 3433 diff changeset	748 /* FIXME: Do a temp copy to a format that is supported */
3433 ad845d9835aa Hmm, this isn't going to work, is it? Sam Lantinga <slouken@libsdl.org> parents: 3431 diff changeset	749 SDL_SetError("Unsupported pixel format");
ad845d9835aa Hmm, this isn't going to work, is it? Sam Lantinga <slouken@libsdl.org> parents: 3431 diff changeset	750 return -1;
ad845d9835aa Hmm, this isn't going to work, is it? Sam Lantinga <slouken@libsdl.org> parents: 3431 diff changeset	751 }
ad845d9835aa Hmm, this isn't going to work, is it? Sam Lantinga <slouken@libsdl.org> parents: 3431 diff changeset	752
5157 fb424691cfc7 Moved the rendering code out to a separate directory in the hope that it can someday be completely decoupled from the rest of the library and be expanded to an awesome 2D on 3D library. Sam Lantinga <slouken@libsdl.org> parents: 5153 diff changeset	753 SDL_GetWindowSize(window, &w, &h);
fb424691cfc7 Moved the rendering code out to a separate directory in the hope that it can someday be completely decoupled from the rest of the library and be expanded to an awesome 2D on 3D library. Sam Lantinga <slouken@libsdl.org> parents: 5153 diff changeset	754
3446 0f969d273f65 First pass (untested) at RenderWritePixels() Sam Lantinga <slouken@libsdl.org> parents: 3443 diff changeset	755 data->glPixelStorei(GL_PACK_ALIGNMENT, 1);
0f969d273f65 First pass (untested) at RenderWritePixels() Sam Lantinga <slouken@libsdl.org> parents: 3443 diff changeset	756 data->glPixelStorei(GL_PACK_ROW_LENGTH,
5159 307ccc9c135e Made it possible to create a texture of any format, even if not supported by the renderer. Sam Lantinga <slouken@libsdl.org> parents: 5157 diff changeset	757 (pitch / SDL_BYTESPERPIXEL(pixel_format)));
3433 ad845d9835aa Hmm, this isn't going to work, is it? Sam Lantinga <slouken@libsdl.org> parents: 3431 diff changeset	758
5157 fb424691cfc7 Moved the rendering code out to a separate directory in the hope that it can someday be completely decoupled from the rest of the library and be expanded to an awesome 2D on 3D library. Sam Lantinga <slouken@libsdl.org> parents: 5153 diff changeset	759 data->glReadPixels(rect->x, (h-rect->y)-rect->h, rect->w, rect->h,
3435 9f62f47d989b You can specify the format for pixel data in SDL_RenderReadPixels() and SDL_RenderWritePixels() Sam Lantinga <slouken@libsdl.org> parents: 3433 diff changeset	760 format, type, pixels);
9f62f47d989b You can specify the format for pixel data in SDL_RenderReadPixels() and SDL_RenderWritePixels() Sam Lantinga <slouken@libsdl.org> parents: 3433 diff changeset	761
9f62f47d989b You can specify the format for pixel data in SDL_RenderReadPixels() and SDL_RenderWritePixels() Sam Lantinga <slouken@libsdl.org> parents: 3433 diff changeset	762 /* Flip the rows to be top-down */
5159 307ccc9c135e Made it possible to create a texture of any format, even if not supported by the renderer. Sam Lantinga <slouken@libsdl.org> parents: 5157 diff changeset	763 length = rect->w * SDL_BYTESPERPIXEL(pixel_format);
3435 9f62f47d989b You can specify the format for pixel data in SDL_RenderReadPixels() and SDL_RenderWritePixels() Sam Lantinga <slouken@libsdl.org> parents: 3433 diff changeset	764 src = (Uint8)pixels + (rect->h-1)pitch;
9f62f47d989b You can specify the format for pixel data in SDL_RenderReadPixels() and SDL_RenderWritePixels() Sam Lantinga <slouken@libsdl.org> parents: 3433 diff changeset	765 dst = (Uint8*)pixels;
9f62f47d989b You can specify the format for pixel data in SDL_RenderReadPixels() and SDL_RenderWritePixels() Sam Lantinga <slouken@libsdl.org> parents: 3433 diff changeset	766 tmp = SDL_stack_alloc(Uint8, length);
9f62f47d989b You can specify the format for pixel data in SDL_RenderReadPixels() and SDL_RenderWritePixels() Sam Lantinga <slouken@libsdl.org> parents: 3433 diff changeset	767 rows = rect->h / 2;
9f62f47d989b You can specify the format for pixel data in SDL_RenderReadPixels() and SDL_RenderWritePixels() Sam Lantinga <slouken@libsdl.org> parents: 3433 diff changeset	768 while (rows--) {
9f62f47d989b You can specify the format for pixel data in SDL_RenderReadPixels() and SDL_RenderWritePixels() Sam Lantinga <slouken@libsdl.org> parents: 3433 diff changeset	769 SDL_memcpy(tmp, dst, length);
9f62f47d989b You can specify the format for pixel data in SDL_RenderReadPixels() and SDL_RenderWritePixels() Sam Lantinga <slouken@libsdl.org> parents: 3433 diff changeset	770 SDL_memcpy(dst, src, length);
9f62f47d989b You can specify the format for pixel data in SDL_RenderReadPixels() and SDL_RenderWritePixels() Sam Lantinga <slouken@libsdl.org> parents: 3433 diff changeset	771 SDL_memcpy(src, tmp, length);
3447 294b770c1989 Fixed GL_RenderReadPixels() - thanks Ryan! Sam Lantinga <slouken@libsdl.org> parents: 3446 diff changeset	772 dst += pitch;
294b770c1989 Fixed GL_RenderReadPixels() - thanks Ryan! Sam Lantinga <slouken@libsdl.org> parents: 3446 diff changeset	773 src -= pitch;
3435 9f62f47d989b You can specify the format for pixel data in SDL_RenderReadPixels() and SDL_RenderWritePixels() Sam Lantinga <slouken@libsdl.org> parents: 3433 diff changeset	774 }
9f62f47d989b You can specify the format for pixel data in SDL_RenderReadPixels() and SDL_RenderWritePixels() Sam Lantinga <slouken@libsdl.org> parents: 3433 diff changeset	775 SDL_stack_free(tmp);
3440 e9502d56ae94 Added missing return values Sam Lantinga <slouken@libsdl.org> parents: 3435 diff changeset	776
e9502d56ae94 Added missing return values Sam Lantinga <slouken@libsdl.org> parents: 3435 diff changeset	777 return 0;
3431 c8fbb27627d9 Work in progress on OpenGL ReadPixels/WritePixels interface Sam Lantinga <slouken@libsdl.org> parents: 3393 diff changeset	778 }
c8fbb27627d9 Work in progress on OpenGL ReadPixels/WritePixels interface Sam Lantinga <slouken@libsdl.org> parents: 3393 diff changeset	779
1918 092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	780 static void
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	781 GL_RenderPresent(SDL_Renderer * renderer)
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	782 {
5150 ad50b3db78bd The rendering functions take a context so it's clear what window they're drawing to. This also potentially opens to the door to multi-threaded rendering in the future. Sam Lantinga <slouken@libsdl.org> parents: 5145 diff changeset	783 GL_ActivateRenderer(renderer);
ad50b3db78bd The rendering functions take a context so it's clear what window they're drawing to. This also potentially opens to the door to multi-threaded rendering in the future. Sam Lantinga <slouken@libsdl.org> parents: 5145 diff changeset	784
1918 092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	785 SDL_GL_SwapWindow(renderer->window);
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	786 }
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	787
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	788 static void
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	789 GL_DestroyTexture(SDL_Renderer * renderer, SDL_Texture * texture)
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	790 {
1927 aeb8263d377a OpenGL renderer is feature complete! Sam Lantinga <slouken@libsdl.org> parents: 1926 diff changeset	791 GL_RenderData renderdata = (GL_RenderData ) renderer->driverdata;
1918 092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	792 GL_TextureData data = (GL_TextureData ) texture->driverdata;
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	793
5150 ad50b3db78bd The rendering functions take a context so it's clear what window they're drawing to. This also potentially opens to the door to multi-threaded rendering in the future. Sam Lantinga <slouken@libsdl.org> parents: 5145 diff changeset	794 GL_ActivateRenderer(renderer);
ad50b3db78bd The rendering functions take a context so it's clear what window they're drawing to. This also potentially opens to the door to multi-threaded rendering in the future. Sam Lantinga <slouken@libsdl.org> parents: 5145 diff changeset	795
1918 092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	796 if (!data) {
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	797 return;
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	798 }
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	799 if (data->texture) {
1927 aeb8263d377a OpenGL renderer is feature complete! Sam Lantinga <slouken@libsdl.org> parents: 1926 diff changeset	800 renderdata->glDeleteTextures(1, &data->texture);
1918 092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	801 }
1920 8a162bfdc838 Convert SDL_malloc to SDL_calloc if appropriate, slightly faster on operating systems which map the zero page for memory allocations. Sam Lantinga <slouken@libsdl.org> parents: 1919 diff changeset	802 if (data->pixels) {
8a162bfdc838 Convert SDL_malloc to SDL_calloc if appropriate, slightly faster on operating systems which map the zero page for memory allocations. Sam Lantinga <slouken@libsdl.org> parents: 1919 diff changeset	803 SDL_free(data->pixels);
8a162bfdc838 Convert SDL_malloc to SDL_calloc if appropriate, slightly faster on operating systems which map the zero page for memory allocations. Sam Lantinga <slouken@libsdl.org> parents: 1919 diff changeset	804 }
1918 092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	805 SDL_free(data);
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	806 texture->driverdata = NULL;
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	807 }
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	808
1975 ccef0d0c40c6 Added resize support for GDI and Direct3D renderers Sam Lantinga <slouken@libsdl.org> parents: 1974 diff changeset	809 static void
1918 092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	810 GL_DestroyRenderer(SDL_Renderer * renderer)
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	811 {
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	812 GL_RenderData data = (GL_RenderData ) renderer->driverdata;
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	813
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	814 if (data) {
1920 8a162bfdc838 Convert SDL_malloc to SDL_calloc if appropriate, slightly faster on operating systems which map the zero page for memory allocations. Sam Lantinga <slouken@libsdl.org> parents: 1919 diff changeset	815 if (data->context) {
2328 91e601d9df8b re: bug#563. checking in some commented out trace code and a fix so that the in testalpha.c the background only flashes when alpha == 255. The problem that is being Bob Pendleton <bob@pendleton.com> parents: 2295 diff changeset	816 /* SDL_GL_MakeCurrent(0, NULL); // doesn't do anything */
1920 8a162bfdc838 Convert SDL_malloc to SDL_calloc if appropriate, slightly faster on operating systems which map the zero page for memory allocations. Sam Lantinga <slouken@libsdl.org> parents: 1919 diff changeset	817 SDL_GL_DeleteContext(data->context);
1918 092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	818 }
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	819 SDL_free(data);
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	820 }
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	821 SDL_free(renderer);
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	822 }
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	823
1952 420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: 1928 diff changeset	824 #endif /* SDL_VIDEO_RENDER_OGL */
1918 092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	825
092bd3a019c5 Starting on the OpenGL renderer... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	826 /* vi: set ts=4 sw=4 expandtab: */

Mercurial > sdl-ios-xcode

annotate src/render/opengl/SDL_render_gl.c @ 5207:daa5463466c5