diff --git a/alienblaster/project/jni/sdl/include/SDL_pixels.h b/alienblaster/project/jni/sdl/include/SDL_pixels.h index 6934105aa..cdf338f9b 100644 --- a/alienblaster/project/jni/sdl/include/SDL_pixels.h +++ b/alienblaster/project/jni/sdl/include/SDL_pixels.h @@ -174,12 +174,18 @@ enum SDL_PIXELFORMAT_ABGR4444 = SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_ABGR, SDL_PACKEDLAYOUT_4444, 16, 2), + SDL_PIXELFORMAT_RGBA4444 = /* Android-specific */ + SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_RGBA, + SDL_PACKEDLAYOUT_4444, 16, 2), SDL_PIXELFORMAT_ARGB1555 = SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_ARGB, SDL_PACKEDLAYOUT_1555, 16, 2), SDL_PIXELFORMAT_ABGR1555 = SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_ABGR, SDL_PACKEDLAYOUT_1555, 16, 2), + SDL_PIXELFORMAT_RGBA5551 = /* Android-specific */ + SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_RGBA, + SDL_PACKEDLAYOUT_5551, 16, 2), SDL_PIXELFORMAT_RGB565 = SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_XRGB, SDL_PACKEDLAYOUT_565, 16, 2), diff --git a/alienblaster/project/jni/sdl/src/video/SDL_renderer_gles.c b/alienblaster/project/jni/sdl/src/video/SDL_renderer_gles.c index 766337459..5a694b755 100644 --- a/alienblaster/project/jni/sdl/src/video/SDL_renderer_gles.c +++ b/alienblaster/project/jni/sdl/src/video/SDL_renderer_gles.c @@ -121,8 +121,8 @@ SDL_RenderDriver GL_ES_RenderDriver = { SDL_PIXELFORMAT_BGR565, #ifdef ANDROID SDL_PIXELFORMAT_RGB565, // Android is special, GL pixelformat has R and B channels not swapped - SDL_PIXELFORMAT_ARGB1555, - SDL_PIXELFORMAT_ARGB4444, + SDL_PIXELFORMAT_RGBA5551, + SDL_PIXELFORMAT_RGBA4444, #endif SDL_PIXELFORMAT_BGR24, SDL_PIXELFORMAT_ABGR8888}, @@ -421,12 +421,12 @@ GLES_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture) format = GL_RGB; type = GL_UNSIGNED_SHORT_5_6_5; break; - case SDL_PIXELFORMAT_ARGB1555: + case SDL_PIXELFORMAT_RGBA5551: internalFormat = GL_RGBA; format = GL_RGBA; type = GL_UNSIGNED_SHORT_5_5_5_1; break; - case SDL_PIXELFORMAT_ARGB4444: + case SDL_PIXELFORMAT_RGBA4444: internalFormat = GL_RGBA; format = GL_RGBA; type = GL_UNSIGNED_SHORT_4_4_4_4;