pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Advertise the most efficient format for the screen. Of course SDL code needs

Browse source 
to be fixed to handle framebuffers with alpha...

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%402599
This commit is contained in:
Sam Lantinga 2007-08-13 02:38:59 +00:00
parent 438f7083d8
commit 5fca3f7890
2 changed files with 5 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/video/SDL_renderer_gl.c
View file

@ -457,15 +457,9 @@ GL_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture)
type = GL_UNSIGNED_BYTE; type = GL_UNSIGNED_BYTE;
break; break;
case SDL_PIXELFORMAT_RGB888: case SDL_PIXELFORMAT_RGB888:
#ifdef __MACOSX__
internalFormat = GL_RGBA;
format = GL_BGRA;
type = GL_UNSIGNED_INT_8_8_8_8_REV;
#else
internalFormat = GL_RGB8; internalFormat = GL_RGB8;
format = GL_BGRA; format = GL_BGRA;
type = GL_UNSIGNED_BYTE; type = GL_UNSIGNED_BYTE;
#endif
break; break;
case SDL_PIXELFORMAT_BGR24: case SDL_PIXELFORMAT_BGR24:
internalFormat = GL_RGB8; internalFormat = GL_RGB8;
@ -574,13 +568,14 @@ GL_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture)
renderdata->glTexParameteri(data->type, GL_TEXTURE_STORAGE_HINT_APPLE, renderdata->glTexParameteri(data->type, GL_TEXTURE_STORAGE_HINT_APPLE,
GL_STORAGE_CACHED_APPLE); GL_STORAGE_CACHED_APPLE);
} }
if (data->pixels && internalFormat == GL_RGBA && format == GL_BGRA if (texture->access == SDL_TEXTUREACCESS_STREAMING && texture->format == SDL_PIXELFORMAT_ARGB8888 ) {
&& type == GL_UNSIGNED_INT_8_8_8_8_REV && data->pixels) { /*
if (renderdata->glTextureRangeAPPLE) { if (renderdata->glTextureRangeAPPLE) {
renderdata->glTextureRangeAPPLE(data->type, renderdata->glTextureRangeAPPLE(data->type,
texture->h * data->pitch, texture->h * data->pitch,
data->pixels); data->pixels);
} }
*/
renderdata->glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_TRUE); renderdata->glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_TRUE);
renderdata->glTexImage2D(data->type, 0, internalFormat, texture_w, renderdata->glTexImage2D(data->type, 0, internalFormat, texture_w,
texture_h, 0, format, type, data->pixels); texture_h, 0, format, type, data->pixels);
@ -806,19 +801,6 @@ GL_RenderCopy(SDL_Renderer * renderer, SDL_Texture * texture,
int bpp = SDL_BYTESPERPIXEL(texture->format); int bpp = SDL_BYTESPERPIXEL(texture->format);
int pitch = texturedata->pitch; int pitch = texturedata->pitch;
#ifdef __MACOSX__
if (texture->format == SDL_PIXELFORMAT_RGB888) {
int i;
Uint8 *p = (Uint8 *) texturedata->pixels;
#if SDL_BYTEORDER == SDL_LIL_ENDIAN
p += 3;
#endif
for (i = texture->h * pitch / 4; i--;) {
*p = 0xff;
p += 4;
}
}
#endif
SetupTextureUpdate(data, texture, pitch); SetupTextureUpdate(data, texture, pitch);
data->glBindTexture(texturedata->type, texturedata->texture); data->glBindTexture(texturedata->type, texturedata->texture);
for (dirty = texturedata->dirty.list; dirty; dirty = dirty->next) { for (dirty = texturedata->dirty.list; dirty; dirty = dirty->next) {

4
src/video/cocoa/SDL_cocoamodes.m
View file

@ -118,10 +118,10 @@ GetDisplayMode(CFDictionaryRef moderef, SDL_DisplayMode *mode)
mode->format = SDL_PIXELFORMAT_INDEX8; mode->format = SDL_PIXELFORMAT_INDEX8;
break; break;
case 16: case 16:
mode->format = SDL_PIXELFORMAT_RGB555; mode->format = SDL_PIXELFORMAT_ARGB1555;
break; break;
case 32: case 32:
mode->format = SDL_PIXELFORMAT_RGB888; mode->format = SDL_PIXELFORMAT_ARGB8888;
break; break;
} }
mode->w = width; mode->w = width;