Commit 0f5368fe11d0eda2064e6d3ce9e90e0ca5ab2809
2021-01-09T10:33:38
PSP cached blending and texturing state, ABGR1555 stencil hack
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 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401
diff --git a/src/render/psp/SDL_render_psp.c b/src/render/psp/SDL_render_psp.c
index c939428..387443f 100644
--- a/src/render/psp/SDL_render_psp.c
+++ b/src/render/psp/SDL_render_psp.c
@@ -56,7 +56,7 @@ static unsigned int __attribute__((aligned(16))) DisplayList[262144];
#define COL4444(r,g,b,a) ((r>>4) | ((g>>4)<<4) | ((b>>4)<<8) | ((a>>4)<<12))
#define COL8888(r,g,b,a) ((r) | ((g)<<8) | ((b)<<16) | ((a)<<24))
-//#define LOGGING
+#define LOGGING
#ifdef LOGGING
#define LOG(...) printf(__VA_ARGS__)
#else
@@ -80,10 +80,17 @@ typedef struct PSP_TextureData
unsigned int format; /**< Image format - one of ::pgePixelFormat. */
unsigned int pitch;
SDL_bool swizzled; /**< Is image swizzled. */
- struct PSP_TextureData* prevhotw; /**< More recently used render target */
- struct PSP_TextureData* nexthotw; /**< Less recently used render target */
+ struct PSP_TextureData* prevhotw; /**< More recently used render target */
+ struct PSP_TextureData* nexthotw; /**< Less recently used render target */
} PSP_TextureData;
+typedef struct
+{
+ SDL_BlendMode mode;
+ unsigned int color;
+ int shadeModel;
+ SDL_Texture* texture;
+} PSP_BlendState;
typedef struct
{
@@ -96,8 +103,7 @@ typedef struct
unsigned int bpp; /**< bits per pixel of the main display */
SDL_bool vsync; /**< wether we do vsync */
- unsigned int currentColor; /**< current drawing color */
- int currentBlendMode; /**< current blend mode */
+ PSP_BlendState blendState; /**< current blend mode */
PSP_TextureData* most_recent_target; /**< start of render target LRU double linked list */
PSP_TextureData* least_recent_target; /**< end of the LRU list */
@@ -174,7 +180,7 @@ Swap(float *a, float *b)
static inline int
InVram(void* data)
{
- return data < 0x04200000;
+ return data < (void*)0x04200000;
}
/* Return next power of 2 */
@@ -264,7 +270,7 @@ LRUTargetRemove(PSP_RenderData* data, PSP_TextureData* psp_texture) {
static void
LRUTargetBringFront(PSP_RenderData* data, PSP_TextureData* psp_texture) {
- LOG("Bringing %p (%dKB) front.\n", (void*)psp_texture, psp_texture->size/1024);
+ //LOG("Bringing %p (%dKB) front.\n", (void*)psp_texture, psp_texture->size/1024);
if(data->most_recent_target == psp_texture) {
return; //nothing to do
}
@@ -473,7 +479,7 @@ TextureSpillLRU(PSP_RenderData* data, size_t wanted) {
if(TextureSpillToSram(data, lru) < 0) {
return -1;
}
- LOG("Spilled %p (%dKB) to ram", (void*)lru, lru->size/1024);
+ LOG("Spilled %p (%dKB) to ram\n", (void*)lru, lru->size/1024);
LRUTargetRemove(data, lru);
#ifdef LOGGING
LRUWalk(data);
@@ -508,10 +514,20 @@ TextureBindAsTarget(PSP_RenderData* data, PSP_TextureData* psp_texture) {
}
}
LRUTargetBringFront(data, psp_texture);
- #ifdef LOGGING
- LRUWalk(data);
- #endif
+ //LRUWalk(data);
sceGuDrawBufferList(psp_texture->format, vrelptr(psp_texture->data), psp_texture->textureWidth);
+ // Stencil alpha dst hack
+ unsigned int dstFormat = psp_texture->format;
+ if(dstFormat == GU_PSM_5551) {
+ sceGuEnable(GU_STENCIL_TEST);
+ sceGuStencilOp(GU_REPLACE, GU_REPLACE, GU_REPLACE);
+ sceGuStencilFunc(GU_GEQUAL, 0xff, 0xff);
+ sceGuEnable(GU_ALPHA_TEST);
+ sceGuAlphaFunc(GU_GREATER, 0x00, 0xff);
+ } else {
+ sceGuDisable(GU_STENCIL_TEST);
+ sceGuDisable(GU_ALPHA_TEST);
+ }
return 0;
}
@@ -562,6 +578,9 @@ PSP_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture)
psp_texture->data = valloc(psp_texture->size);
if(psp_texture->data) {
LRUTargetPushFront(data, psp_texture);
+ #ifdef LOGGING
+ LRUWalk(data);
+ #endif
}
} else {
psp_texture->data = SDL_calloc(1, psp_texture->size);
@@ -577,12 +596,6 @@ PSP_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture)
return 0;
}
-static inline int
-InVram(void* data)
-{
- return data < 0x04200000;
-}
-
static int
TextureShouldSwizzle(PSP_TextureData* psp_texture, SDL_Texture *texture)
{
@@ -602,13 +615,11 @@ TextureActivate(SDL_Texture * texture)
TextureSwizzle(psp_texture, NULL);
}
- sceGuEnable(GU_TEXTURE_2D);
sceGuTexWrap(GU_REPEAT, GU_REPEAT);
sceGuTexMode(psp_texture->format, 0, 0, psp_texture->swizzled);
sceGuTexFilter(scaleMode, scaleMode); /* GU_NEAREST good for tile-map */
/* GU_LINEAR good for scaling */
sceGuTexImage(0, psp_texture->textureWidth, psp_texture->textureHeight, psp_texture->textureWidth, psp_texture->data);
- sceGuTexFunc(GU_TFX_REPLACE, GU_TCC_RGBA);
}
static int
@@ -985,6 +996,16 @@ PSP_QueueCopyEx(SDL_Renderer * renderer, SDL_RenderCommand *cmd, SDL_Texture * t
return 0;
}
+static void
+ResetBlendState(PSP_BlendState* state) {
+ sceGuColor(0xffffffff);
+ state->color = 0xffffffff;
+ state->mode = SDL_BLENDMODE_INVALID;
+ state->texture = NULL;
+ sceGuDisable(GU_TEXTURE_2D);
+ sceGuShadeModel(GU_SMOOTH);
+ state->shadeModel = GU_SMOOTH;
+}
static void
StartDrawing(SDL_Renderer * renderer)
@@ -995,6 +1016,7 @@ StartDrawing(SDL_Renderer * renderer)
if(!data->displayListAvail) {
sceGuStart(GU_DIRECT, DisplayList);
data->displayListAvail = SDL_TRUE;
+ ResetBlendState(&data->blendState);
}
// Check if we need a draw buffer change
@@ -1014,38 +1036,59 @@ StartDrawing(SDL_Renderer * renderer)
static void
-PSP_SetBlendMode(SDL_Renderer * renderer, int blendMode)
+PSP_SetBlendState(PSP_RenderData* data, PSP_BlendState* state)
{
- PSP_RenderData *data = (PSP_RenderData *) renderer->driverdata;
- if (blendMode != data-> currentBlendMode) {
- switch (blendMode) {
+ PSP_BlendState* current = &data->blendState;
+
+ if (state->mode != current->mode) {
+ switch (state->mode) {
case SDL_BLENDMODE_NONE:
- sceGuTexFunc(GU_TFX_REPLACE, GU_TCC_RGBA);
- sceGuDisable(GU_BLEND);
+ sceGuTexFunc(GU_TFX_REPLACE, GU_TCC_RGBA);
+ sceGuDisable(GU_BLEND);
break;
case SDL_BLENDMODE_BLEND:
- sceGuTexFunc(GU_TFX_MODULATE , GU_TCC_RGBA);
- sceGuEnable(GU_BLEND);
- sceGuBlendFunc(GU_ADD, GU_SRC_ALPHA, GU_ONE_MINUS_SRC_ALPHA, 0, 0 );
+ sceGuTexFunc(GU_TFX_MODULATE, GU_TCC_RGBA);
+ sceGuBlendFunc(GU_ADD, GU_SRC_ALPHA, GU_ONE_MINUS_SRC_ALPHA, 0, 0 );
+ sceGuEnable(GU_BLEND);
break;
case SDL_BLENDMODE_ADD:
- sceGuTexFunc(GU_TFX_MODULATE , GU_TCC_RGBA);
- sceGuEnable(GU_BLEND);
- sceGuBlendFunc(GU_ADD, GU_SRC_ALPHA, GU_FIX, 0, 0x00FFFFFF );
+ sceGuTexFunc(GU_TFX_MODULATE , GU_TCC_RGBA);
+ sceGuBlendFunc(GU_ADD, GU_SRC_ALPHA, GU_FIX, 0, 0x00FFFFFF );
+ sceGuEnable(GU_BLEND);
break;
case SDL_BLENDMODE_MOD:
- sceGuTexFunc(GU_TFX_MODULATE , GU_TCC_RGBA);
- sceGuEnable(GU_BLEND);
- sceGuBlendFunc(GU_ADD, GU_FIX, GU_SRC_COLOR, 0, 0);
+ sceGuTexFunc(GU_TFX_MODULATE , GU_TCC_RGBA);
+ sceGuBlendFunc(GU_ADD, GU_FIX, GU_SRC_COLOR, 0, 0);
+ sceGuEnable(GU_BLEND);
break;
case SDL_BLENDMODE_MUL:
- sceGuTexFunc(GU_TFX_MODULATE , GU_TCC_RGBA);
- sceGuEnable(GU_BLEND);
- sceGuBlendFunc(GU_ADD, GU_DST_COLOR, GU_ONE_MINUS_SRC_ALPHA, 0, 0);
+ sceGuTexFunc(GU_TFX_MODULATE , GU_TCC_RGBA);
+ sceGuBlendFunc(GU_ADD, GU_DST_COLOR, GU_ONE_MINUS_SRC_ALPHA, 0, 0);
+ sceGuEnable(GU_BLEND);
+ break;
+ case SDL_BLENDMODE_INVALID:
break;
}
- data->currentBlendMode = blendMode;
}
+
+ if(state->color != current->color) {
+ sceGuColor(state->color);
+ }
+
+ if(state->shadeModel != current->shadeModel) {
+ sceGuShadeModel(state->shadeModel);
+ }
+
+ if(state->texture != current->texture) {
+ if(state->texture != NULL) {
+ TextureActivate(state->texture);
+ sceGuEnable(GU_TEXTURE_2D);
+ } else {
+ sceGuDisable(GU_TEXTURE_2D);
+ }
+ }
+
+ *current = *state;
}
static int
@@ -1099,10 +1142,9 @@ PSP_RunCommandQueue(SDL_Renderer * renderer, SDL_RenderCommand *cmd, void *verti
const Uint8 g = cmd->data.color.g;
const Uint8 b = cmd->data.color.b;
const Uint8 a = cmd->data.color.a;
- const Uint32 color = (((Uint32)a << 24) | (b << 16) | (g << 8) | r);
- /* !!! FIXME: we could cache drawstate like clear color */
- sceGuClearColor(color);
- sceGuClear(GU_COLOR_BUFFER_BIT);//|GU_FAST_CLEAR_BIT);
+ sceGuClearColor(GU_RGBA(r,g,b,a));
+ sceGuClearStencil(a);
+ sceGuClear(GU_COLOR_BUFFER_BIT | GU_STENCIL_BUFFER_BIT);
break;
}
@@ -1113,14 +1155,14 @@ PSP_RunCommandQueue(SDL_Renderer * renderer, SDL_RenderCommand *cmd, void *verti
const Uint8 g = cmd->data.draw.g;
const Uint8 b = cmd->data.draw.b;
const Uint8 a = cmd->data.draw.a;
- const Uint32 color = (((Uint32)a << 24) | (b << 16) | (g << 8) | r);
- /* !!! FIXME: we could cache draw state like color, texturing, etc */
- sceGuColor(color);
- sceGuDisable(GU_TEXTURE_2D);
- sceGuShadeModel(GU_FLAT);
+ PSP_BlendState state = {
+ .color = GU_RGBA(r,g,b,a),
+ .texture = NULL,
+ .mode = cmd->data.draw.blend,
+ .shadeModel = GU_FLAT
+ };
+ PSP_SetBlendState(data, &state);
sceGuDrawArray(GU_POINTS, GU_VERTEX_32BITF|GU_TRANSFORM_2D, count, 0, verts);
- sceGuShadeModel(GU_SMOOTH);
- sceGuEnable(GU_TEXTURE_2D);
break;
}
@@ -1131,14 +1173,14 @@ PSP_RunCommandQueue(SDL_Renderer * renderer, SDL_RenderCommand *cmd, void *verti
const Uint8 g = cmd->data.draw.g;
const Uint8 b = cmd->data.draw.b;
const Uint8 a = cmd->data.draw.a;
- const Uint32 color = (((Uint32)a << 24) | (b << 16) | (g << 8) | r);
- /* !!! FIXME: we could cache draw state like color, texturing, etc */
- sceGuColor(color);
- sceGuDisable(GU_TEXTURE_2D);
- sceGuShadeModel(GU_FLAT);
+ PSP_BlendState state = {
+ .color = GU_RGBA(r,g,b,a),
+ .texture = NULL,
+ .mode = cmd->data.draw.blend,
+ .shadeModel = GU_FLAT
+ };
+ PSP_SetBlendState(data, &state);
sceGuDrawArray(GU_LINE_STRIP, GU_VERTEX_32BITF|GU_TRANSFORM_2D, count, 0, verts);
- sceGuShadeModel(GU_SMOOTH);
- sceGuEnable(GU_TEXTURE_2D);
break;
}
@@ -1149,59 +1191,49 @@ PSP_RunCommandQueue(SDL_Renderer * renderer, SDL_RenderCommand *cmd, void *verti
const Uint8 g = cmd->data.draw.g;
const Uint8 b = cmd->data.draw.b;
const Uint8 a = cmd->data.draw.a;
- const Uint32 color = (((Uint32)a << 24) | (b << 16) | (g << 8) | r);
- /* !!! FIXME: we could cache draw state like color, texturing, etc */
- sceGuColor(color);
- sceGuDisable(GU_TEXTURE_2D);
- sceGuShadeModel(GU_FLAT);
+ PSP_BlendState state = {
+ .color = GU_RGBA(r,g,b,a),
+ .texture = NULL,
+ .mode = cmd->data.draw.blend,
+ .shadeModel = GU_FLAT
+ };
+ PSP_SetBlendState(data, &state);
sceGuDrawArray(GU_SPRITES, GU_VERTEX_32BITF|GU_TRANSFORM_2D, 2 * count, 0, verts);
- sceGuShadeModel(GU_SMOOTH);
- sceGuEnable(GU_TEXTURE_2D);
break;
}
case SDL_RENDERCMD_COPY: {
const size_t count = cmd->data.draw.count;
const VertTV *verts = (VertTV *) (gpumem + cmd->data.draw.first);
- const Uint8 alpha = cmd->data.draw.a;
- TextureActivate(cmd->data.draw.texture);
- PSP_SetBlendMode(renderer, cmd->data.draw.blend);
-
- if(alpha != 255) { /* !!! FIXME: is this right? */
- sceGuTexFunc(GU_TFX_MODULATE, GU_TCC_RGBA);
- sceGuColor(GU_RGBA(255, 255, 255, alpha));
- } else {
- sceGuTexFunc(GU_TFX_REPLACE, GU_TCC_RGBA);
- sceGuColor(0xFFFFFFFF);
- }
-
+ const Uint8 a = cmd->data.draw.a;
+ const Uint8 r = cmd->data.draw.r;
+ const Uint8 g = cmd->data.draw.g;
+ const Uint8 b = cmd->data.draw.b;
+ PSP_BlendState state = {
+ .color = GU_RGBA(r,g,b,a),
+ .texture = cmd->data.draw.texture,
+ .mode = cmd->data.draw.blend,
+ .shadeModel = GU_SMOOTH
+ };
+ PSP_SetBlendState(data, &state);
sceGuDrawArray(GU_SPRITES, GU_TEXTURE_32BITF|GU_VERTEX_32BITF|GU_TRANSFORM_2D, 2 * count, 0, verts);
-
- if(alpha != 255) {
- sceGuTexFunc(GU_TFX_REPLACE, GU_TCC_RGBA);
- }
break;
}
case SDL_RENDERCMD_COPY_EX: {
const VertTV *verts = (VertTV *) (gpumem + cmd->data.draw.first);
- const Uint8 alpha = cmd->data.draw.a;
- TextureActivate(cmd->data.draw.texture);
- PSP_SetBlendMode(renderer, cmd->data.draw.blend);
-
- if(alpha != 255) { /* !!! FIXME: is this right? */
- sceGuTexFunc(GU_TFX_MODULATE, GU_TCC_RGBA);
- sceGuColor(GU_RGBA(255, 255, 255, alpha));
- } else {
- sceGuTexFunc(GU_TFX_REPLACE, GU_TCC_RGBA);
- sceGuColor(0xFFFFFFFF);
- }
-
+ const Uint8 a = cmd->data.draw.a;
+ const Uint8 r = cmd->data.draw.r;
+ const Uint8 g = cmd->data.draw.g;
+ const Uint8 b = cmd->data.draw.b;
+ PSP_BlendState state = {
+ .color = GU_RGBA(r,g,b,a),
+ .texture = cmd->data.draw.texture,
+ .mode = cmd->data.draw.blend,
+ .shadeModel = GU_SMOOTH
+ };
+ PSP_SetBlendState(data, &state);
sceGuDrawArray(GU_TRIANGLE_FAN, GU_TEXTURE_32BITF|GU_VERTEX_32BITF|GU_TRANSFORM_2D, 4, 0, verts);
-
- if(alpha != 255) {
- sceGuTexFunc(GU_TFX_REPLACE, GU_TCC_RGBA);
- }
break;
}
@@ -1395,6 +1427,7 @@ PSP_CreateRenderer(SDL_Window * window, Uint32 flags)
doublebuffer = valloc(PSP_FRAME_BUFFER_SIZE*data->bpp*2);
data->backbuffer = doublebuffer;
data->frontbuffer = ((uint8_t*)doublebuffer)+PSP_FRAME_BUFFER_SIZE*data->bpp;
+ memset(&data->blendState, 0, sizeof(PSP_BlendState));
sceGuInit();
/* setup GU */
@@ -1426,8 +1459,8 @@ PSP_CreateRenderer(SDL_Window * window, Uint32 flags)
sceGuTexWrap(GU_REPEAT, GU_REPEAT);
/* Blending */
- sceGuEnable(GU_BLEND);
- sceGuBlendFunc(GU_ADD, GU_SRC_ALPHA, GU_ONE_MINUS_SRC_ALPHA, 0, 0);
+ //sceGuEnable(GU_BLEND);
+ //sceGuBlendFunc(GU_ADD, GU_SRC_ALPHA, GU_ONE_MINUS_SRC_ALPHA, 0, 0);
sceGuTexFilter(GU_LINEAR,GU_LINEAR);