Mercurial > sdl-ios-xcode
diff src/video/SDL_renderer_gl.c @ 2295:dbc6d1893869
Checking in Christian Walther's patch for x11 keyboard input. Minor code tweaks by Bob.
| author | Bob Pendleton <bob@pendleton.com> |
|---|---|
| date | Tue, 08 Jan 2008 00:10:46 +0000 |
| parents | 12ea0fdc0df2 |
| children | 91e601d9df8b |
line wrap: on
line diff
--- a/src/video/SDL_renderer_gl.c Thu Jan 03 06:07:30 2008 +0000 +++ b/src/video/SDL_renderer_gl.c Tue Jan 08 00:10:46 2008 +0000 @@ -295,12 +295,11 @@ GL_DestroyRenderer(renderer); return NULL; } - #ifdef __MACOSX__ /* Enable multi-threaded rendering */ /* Disabled until Ryan finishes his VBO/PBO code... - CGLEnable(CGLGetCurrentContext(), kCGLCEMPEngine); - */ + CGLEnable(CGLGetCurrentContext(), kCGLCEMPEngine); + */ #endif if (flags & SDL_RENDERER_PRESENTVSYNC) { @@ -579,14 +578,15 @@ renderdata->glTexParameteri(data->type, GL_TEXTURE_STORAGE_HINT_APPLE, GL_STORAGE_CACHED_APPLE); } - if (texture->access == SDL_TEXTUREACCESS_STREAMING && texture->format == SDL_PIXELFORMAT_ARGB8888 ) { + if (texture->access == SDL_TEXTUREACCESS_STREAMING + && texture->format == SDL_PIXELFORMAT_ARGB8888) { /* - if (renderdata->glTextureRangeAPPLE) { - renderdata->glTextureRangeAPPLE(data->type, - texture->h * data->pitch, - data->pixels); - } - */ + if (renderdata->glTextureRangeAPPLE) { + renderdata->glTextureRangeAPPLE(data->type, + texture->h * data->pitch, + data->pixels); + } + */ renderdata->glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_TRUE); renderdata->glTexImage2D(data->type, 0, internalFormat, texture_w, texture_h, 0, format, type, data->pixels);