isledecomp/isle-portable
1
0
Fork 0
mirror of https://github.com/isledecomp/isle-portable.git synced 2026-01-20 06:01:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix transition on gxm

Browse Source
This commit is contained in:
olebeck 2025-07-06 13:21:31 +02:00
parent df27d5c9b5
commit 02371e33ba
3 changed files with 40 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ISLE/vita/config.cpp
View File

@ -13,5 +13,5 @@ void VITA_SetupDefaultConfigOverrides(dictionary* p_dictionary)
iniparser_set(p_dictionary, "isle:Draw Cursor", "true"); iniparser_set(p_dictionary, "isle:Draw Cursor", "true");
// Use e_noAnimation/cut transition // Use e_noAnimation/cut transition
iniparser_set(p_dictionary, "isle:Transition Type", "1"); //iniparser_set(p_dictionary, "isle:Transition Type", "1");
} }

1
miniwin/src/d3drm/backends/gxm/gxm_context.h
View File

@ -75,6 +75,7 @@ typedef struct GXMContext {
bool sceneStarted; bool sceneStarted;
void swap_display(); void swap_display();
void copy_frontbuffer();
int init(); int init();
void destroy(); void destroy();
void clear(float r, float g, float b, bool new_scene); void clear(float r, float g, float b, bool new_scene);

45
miniwin/src/d3drm/backends/gxm/renderer.cpp
View File

@ -549,6 +549,30 @@ void GXMContext::clear(float r, float g, float b, bool new_scene) {
} }
} }
void GXMContext::copy_frontbuffer() {
SceGxmTexture texture;
sceGxmTextureInitLinearStrided(&texture,
this->displayBuffers[this->frontBufferIndex],
SCE_GXM_TEXTURE_FORMAT_U8U8U8U8_ABGR,
VITA_GXM_SCREEN_WIDTH,
VITA_GXM_SCREEN_HEIGHT,
VITA_GXM_SCREEN_STRIDE*4
);
sceGxmSetVertexProgram(this->context, this->planeVertexProgram);
sceGxmSetFragmentProgram(this->context, this->imageFragmentProgram);
void* vertUniforms;
void* fragUniforms;
sceGxmReserveVertexDefaultUniformBuffer(this->context, &vertUniforms);
sceGxmReserveFragmentDefaultUniformBuffer(this->context, &fragUniforms);
sceGxmSetVertexStream(this->context, 0, this->clearVertices);
sceGxmSetFragmentTexture(this->context, 0, &texture);
sceGxmSetFrontDepthFunc(this->context, SCE_GXM_DEPTH_FUNC_ALWAYS);
sceGxmDraw(this->context, SCE_GXM_PRIMITIVE_TRIANGLE_STRIP, SCE_GXM_INDEX_FORMAT_U16, this->clearIndices, 4);
}
void GXMContext::destroy() { void GXMContext::destroy() {
sceGxmDisplayQueueFinish(); sceGxmDisplayQueueFinish();
if(gxm->context) sceGxmFinish(gxm->context); if(gxm->context) sceGxmFinish(gxm->context);
@ -1065,10 +1089,17 @@ Uint32 GXMRenderer::GetTextureId(IDirect3DRMTexture* iTexture, bool isUi, float
SceGxmTexture gxmTexture; SceGxmTexture gxmTexture;
SCE_ERR(sceGxmTextureInitLinear, &gxmTexture, textureData, gxmTextureFormat, textureWidth, textureHeight, 0); SCE_ERR(sceGxmTextureInitLinear, &gxmTexture, textureData, gxmTextureFormat, textureWidth, textureHeight, 0);
sceGxmTextureSetMinFilter(&gxmTexture, SCE_GXM_TEXTURE_FILTER_LINEAR); if(isUi) {
sceGxmTextureSetMagFilter(&gxmTexture, SCE_GXM_TEXTURE_FILTER_LINEAR); sceGxmTextureSetMinFilter(&gxmTexture, SCE_GXM_TEXTURE_FILTER_POINT);
sceGxmTextureSetUAddrMode(&gxmTexture, SCE_GXM_TEXTURE_ADDR_REPEAT); sceGxmTextureSetMagFilter(&gxmTexture, SCE_GXM_TEXTURE_FILTER_POINT);
sceGxmTextureSetVAddrMode(&gxmTexture, SCE_GXM_TEXTURE_ADDR_REPEAT); sceGxmTextureSetUAddrMode(&gxmTexture, SCE_GXM_TEXTURE_ADDR_CLAMP);
sceGxmTextureSetVAddrMode(&gxmTexture, SCE_GXM_TEXTURE_ADDR_CLAMP);
} else {
sceGxmTextureSetMinFilter(&gxmTexture, SCE_GXM_TEXTURE_FILTER_LINEAR);
sceGxmTextureSetMagFilter(&gxmTexture, SCE_GXM_TEXTURE_FILTER_LINEAR);
sceGxmTextureSetUAddrMode(&gxmTexture, SCE_GXM_TEXTURE_ADDR_REPEAT);
sceGxmTextureSetVAddrMode(&gxmTexture, SCE_GXM_TEXTURE_ADDR_REPEAT);
}
if (gxmTextureFormat == SCE_GXM_TEXTURE_FORMAT_P8_ABGR) { if (gxmTextureFormat == SCE_GXM_TEXTURE_FORMAT_P8_ABGR) {
sceGxmTextureSetPalette(&gxmTexture, (uint8_t*) textureData + paletteOffset); sceGxmTextureSetPalette(&gxmTexture, (uint8_t*) textureData + paletteOffset);
} }
@ -1554,7 +1585,7 @@ void GXMRenderer::Clear(float r, float g, float b)
void GXMRenderer::Flip() void GXMRenderer::Flip()
{ {
if (!gxm->sceneStarted) { if (!gxm->sceneStarted) {
this->Clear(0, 0, 0); return;
} }
++this->vertexNotifications[this->currentVertexBufferIndex].value; ++this->vertexNotifications[this->currentVertexBufferIndex].value;
@ -1663,8 +1694,8 @@ void GXMRenderer::Download(SDL_Surface* target)
SDL_Surface* src = SDL_CreateSurfaceFrom( SDL_Surface* src = SDL_CreateSurfaceFrom(
VITA_GXM_SCREEN_WIDTH, VITA_GXM_SCREEN_WIDTH,
VITA_GXM_SCREEN_HEIGHT, VITA_GXM_SCREEN_HEIGHT,
SDL_PIXELFORMAT_BGRA8888, SDL_PIXELFORMAT_ABGR8888,
gxm->displayBuffers[gxm->backBufferIndex], gxm->displayBuffers[gxm->frontBufferIndex],
VITA_GXM_SCREEN_STRIDE*4 VITA_GXM_SCREEN_STRIDE*4
); );
SDL_BlitSurfaceScaled(src, &srcRect, target, nullptr, SDL_SCALEMODE_NEAREST); SDL_BlitSurfaceScaled(src, &srcRect, target, nullptr, SDL_SCALEMODE_NEAREST);