Commit 5df11f8aa1fca1d0081c9f538b96361f2c8a6201
2014-06-21T21:46:42
Made SDL_PIXELFORMAT_ARGB8888 the default texture format for consistency across renderer implementations.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247
diff --git a/src/render/opengles2/SDL_render_gles2.c b/src/render/opengles2/SDL_render_gles2.c
index d108e9a..2d7c7ba 100644
--- a/src/render/opengles2/SDL_render_gles2.c
+++ b/src/render/opengles2/SDL_render_gles2.c
@@ -49,10 +49,12 @@ SDL_RenderDriver GLES2_RenderDriver = {
"opengles2",
(SDL_RENDERER_ACCELERATED | SDL_RENDERER_PRESENTVSYNC | SDL_RENDERER_TARGETTEXTURE),
4,
- {SDL_PIXELFORMAT_ABGR8888,
+ {
SDL_PIXELFORMAT_ARGB8888,
+ SDL_PIXELFORMAT_ABGR8888,
SDL_PIXELFORMAT_RGB888,
- SDL_PIXELFORMAT_BGR888},
+ SDL_PIXELFORMAT_BGR888
+ },
0,
0
}
@@ -477,10 +479,10 @@ GLES2_CreateTexture(SDL_Renderer *renderer, SDL_Texture *texture)
/* Determine the corresponding GLES texture format params */
switch (texture->format)
{
- case SDL_PIXELFORMAT_ABGR8888:
case SDL_PIXELFORMAT_ARGB8888:
- case SDL_PIXELFORMAT_BGR888:
+ case SDL_PIXELFORMAT_ABGR8888:
case SDL_PIXELFORMAT_RGB888:
+ case SDL_PIXELFORMAT_BGR888:
format = GL_RGBA;
type = GL_UNSIGNED_BYTE;
break;
@@ -1417,54 +1419,54 @@ GLES2_RenderCopy(SDL_Renderer *renderer, SDL_Texture *texture, const SDL_Rect *s
if (renderer->target->format != texture->format) {
switch (texture->format)
{
- case SDL_PIXELFORMAT_ABGR8888:
+ case SDL_PIXELFORMAT_ARGB8888:
switch (renderer->target->format)
{
- case SDL_PIXELFORMAT_ARGB8888:
- case SDL_PIXELFORMAT_RGB888:
+ case SDL_PIXELFORMAT_ABGR8888:
+ case SDL_PIXELFORMAT_BGR888:
sourceType = GLES2_IMAGESOURCE_TEXTURE_ARGB;
break;
- case SDL_PIXELFORMAT_BGR888:
+ case SDL_PIXELFORMAT_RGB888:
sourceType = GLES2_IMAGESOURCE_TEXTURE_ABGR;
break;
}
break;
- case SDL_PIXELFORMAT_ARGB8888:
+ case SDL_PIXELFORMAT_ABGR8888:
switch (renderer->target->format)
{
- case SDL_PIXELFORMAT_ABGR8888:
- case SDL_PIXELFORMAT_BGR888:
+ case SDL_PIXELFORMAT_ARGB8888:
+ case SDL_PIXELFORMAT_RGB888:
sourceType = GLES2_IMAGESOURCE_TEXTURE_ARGB;
break;
- case SDL_PIXELFORMAT_RGB888:
+ case SDL_PIXELFORMAT_BGR888:
sourceType = GLES2_IMAGESOURCE_TEXTURE_ABGR;
break;
}
break;
- case SDL_PIXELFORMAT_BGR888:
+ case SDL_PIXELFORMAT_RGB888:
switch (renderer->target->format)
{
case SDL_PIXELFORMAT_ABGR8888:
- sourceType = GLES2_IMAGESOURCE_TEXTURE_BGR;
+ sourceType = GLES2_IMAGESOURCE_TEXTURE_ARGB;
break;
case SDL_PIXELFORMAT_ARGB8888:
- sourceType = GLES2_IMAGESOURCE_TEXTURE_RGB;
+ sourceType = GLES2_IMAGESOURCE_TEXTURE_BGR;
break;
- case SDL_PIXELFORMAT_RGB888:
+ case SDL_PIXELFORMAT_BGR888:
sourceType = GLES2_IMAGESOURCE_TEXTURE_ARGB;
break;
}
break;
- case SDL_PIXELFORMAT_RGB888:
+ case SDL_PIXELFORMAT_BGR888:
switch (renderer->target->format)
{
case SDL_PIXELFORMAT_ABGR8888:
- sourceType = GLES2_IMAGESOURCE_TEXTURE_ARGB;
+ sourceType = GLES2_IMAGESOURCE_TEXTURE_BGR;
break;
case SDL_PIXELFORMAT_ARGB8888:
- sourceType = GLES2_IMAGESOURCE_TEXTURE_BGR;
+ sourceType = GLES2_IMAGESOURCE_TEXTURE_RGB;
break;
- case SDL_PIXELFORMAT_BGR888:
+ case SDL_PIXELFORMAT_RGB888:
sourceType = GLES2_IMAGESOURCE_TEXTURE_ARGB;
break;
}
@@ -1476,18 +1478,18 @@ GLES2_RenderCopy(SDL_Renderer *renderer, SDL_Texture *texture, const SDL_Rect *s
else {
switch (texture->format)
{
- case SDL_PIXELFORMAT_ABGR8888:
- sourceType = GLES2_IMAGESOURCE_TEXTURE_ABGR;
- break;
case SDL_PIXELFORMAT_ARGB8888:
sourceType = GLES2_IMAGESOURCE_TEXTURE_ARGB;
break;
- case SDL_PIXELFORMAT_BGR888:
- sourceType = GLES2_IMAGESOURCE_TEXTURE_BGR;
+ case SDL_PIXELFORMAT_ABGR8888:
+ sourceType = GLES2_IMAGESOURCE_TEXTURE_ABGR;
break;
case SDL_PIXELFORMAT_RGB888:
sourceType = GLES2_IMAGESOURCE_TEXTURE_RGB;
break;
+ case SDL_PIXELFORMAT_BGR888:
+ sourceType = GLES2_IMAGESOURCE_TEXTURE_BGR;
+ break;
// TODO: new shader to change yv planes YV12 format
case SDL_PIXELFORMAT_IYUV:
case SDL_PIXELFORMAT_YV12:
@@ -1599,54 +1601,54 @@ GLES2_RenderCopyEx(SDL_Renderer *renderer, SDL_Texture *texture, const SDL_Rect
if (renderer->target->format != texture->format) {
switch (texture->format)
{
- case SDL_PIXELFORMAT_ABGR8888:
+ case SDL_PIXELFORMAT_ARGB8888:
switch (renderer->target->format)
{
- case SDL_PIXELFORMAT_ARGB8888:
- case SDL_PIXELFORMAT_RGB888:
+ case SDL_PIXELFORMAT_ABGR8888:
+ case SDL_PIXELFORMAT_BGR888:
sourceType = GLES2_IMAGESOURCE_TEXTURE_ARGB;
break;
- case SDL_PIXELFORMAT_BGR888:
+ case SDL_PIXELFORMAT_RGB888:
sourceType = GLES2_IMAGESOURCE_TEXTURE_ABGR;
break;
}
break;
- case SDL_PIXELFORMAT_ARGB8888:
+ case SDL_PIXELFORMAT_ABGR8888:
switch (renderer->target->format)
{
- case SDL_PIXELFORMAT_ABGR8888:
- case SDL_PIXELFORMAT_BGR888:
+ case SDL_PIXELFORMAT_ARGB8888:
+ case SDL_PIXELFORMAT_RGB888:
sourceType = GLES2_IMAGESOURCE_TEXTURE_ARGB;
break;
- case SDL_PIXELFORMAT_RGB888:
+ case SDL_PIXELFORMAT_BGR888:
sourceType = GLES2_IMAGESOURCE_TEXTURE_ABGR;
break;
}
break;
- case SDL_PIXELFORMAT_BGR888:
+ case SDL_PIXELFORMAT_RGB888:
switch (renderer->target->format)
{
case SDL_PIXELFORMAT_ABGR8888:
- sourceType = GLES2_IMAGESOURCE_TEXTURE_BGR;
+ sourceType = GLES2_IMAGESOURCE_TEXTURE_ARGB;
break;
case SDL_PIXELFORMAT_ARGB8888:
- sourceType = GLES2_IMAGESOURCE_TEXTURE_RGB;
+ sourceType = GLES2_IMAGESOURCE_TEXTURE_BGR;
break;
- case SDL_PIXELFORMAT_RGB888:
+ case SDL_PIXELFORMAT_BGR888:
sourceType = GLES2_IMAGESOURCE_TEXTURE_ARGB;
break;
}
break;
- case SDL_PIXELFORMAT_RGB888:
+ case SDL_PIXELFORMAT_BGR888:
switch (renderer->target->format)
{
case SDL_PIXELFORMAT_ABGR8888:
- sourceType = GLES2_IMAGESOURCE_TEXTURE_ARGB;
+ sourceType = GLES2_IMAGESOURCE_TEXTURE_BGR;
break;
case SDL_PIXELFORMAT_ARGB8888:
- sourceType = GLES2_IMAGESOURCE_TEXTURE_BGR;
+ sourceType = GLES2_IMAGESOURCE_TEXTURE_RGB;
break;
- case SDL_PIXELFORMAT_BGR888:
+ case SDL_PIXELFORMAT_RGB888:
sourceType = GLES2_IMAGESOURCE_TEXTURE_ARGB;
break;
}
@@ -1658,18 +1660,18 @@ GLES2_RenderCopyEx(SDL_Renderer *renderer, SDL_Texture *texture, const SDL_Rect
else {
switch (texture->format)
{
- case SDL_PIXELFORMAT_ABGR8888:
- sourceType = GLES2_IMAGESOURCE_TEXTURE_ABGR;
- break;
case SDL_PIXELFORMAT_ARGB8888:
sourceType = GLES2_IMAGESOURCE_TEXTURE_ARGB;
break;
- case SDL_PIXELFORMAT_BGR888:
- sourceType = GLES2_IMAGESOURCE_TEXTURE_BGR;
+ case SDL_PIXELFORMAT_ABGR8888:
+ sourceType = GLES2_IMAGESOURCE_TEXTURE_ABGR;
break;
case SDL_PIXELFORMAT_RGB888:
sourceType = GLES2_IMAGESOURCE_TEXTURE_RGB;
break;
+ case SDL_PIXELFORMAT_BGR888:
+ sourceType = GLES2_IMAGESOURCE_TEXTURE_BGR;
+ break;
default:
return -1;
}
diff --git a/src/render/software/SDL_render_sw.c b/src/render/software/SDL_render_sw.c
index 29d331f..aa640e4 100644
--- a/src/render/software/SDL_render_sw.c
+++ b/src/render/software/SDL_render_sw.c
@@ -82,14 +82,14 @@ SDL_RenderDriver SW_RenderDriver = {
SDL_RENDERER_SOFTWARE | SDL_RENDERER_TARGETTEXTURE,
8,
{
- SDL_PIXELFORMAT_RGB555,
- SDL_PIXELFORMAT_RGB565,
- SDL_PIXELFORMAT_RGB888,
- SDL_PIXELFORMAT_BGR888,
SDL_PIXELFORMAT_ARGB8888,
- SDL_PIXELFORMAT_RGBA8888,
SDL_PIXELFORMAT_ABGR8888,
- SDL_PIXELFORMAT_BGRA8888
+ SDL_PIXELFORMAT_RGBA8888,
+ SDL_PIXELFORMAT_BGRA8888,
+ SDL_PIXELFORMAT_RGB888,
+ SDL_PIXELFORMAT_BGR888,
+ SDL_PIXELFORMAT_RGB555,
+ SDL_PIXELFORMAT_RGB565
},
0,
0}