eukara
/
fallout2-ce
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Extract renderPresent

This commit is contained in:
Alexander Batalov 2022-10-06 19:10:01 +03:00
parent 54d230432b
commit 266c727870
3 changed files with 16 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/movie.cc
View File

@ -327,10 +327,7 @@ static void movieDirectImpl(SDL_Surface* surface, int srcWidth, int srcHeight, i
SDL_SetSurfacePalette(surface, gSdlSurface->format->palette); SDL_SetSurfacePalette(surface, gSdlSurface->format->palette);
SDL_BlitSurface(surface, &srcRect, gSdlSurface, &destRect); SDL_BlitSurface(surface, &srcRect, gSdlSurface, &destRect);
SDL_BlitSurface(gSdlSurface, NULL, gSdlTextureSurface, NULL); SDL_BlitSurface(gSdlSurface, NULL, gSdlTextureSurface, NULL);
SDL_UpdateTexture(gSdlTexture, NULL, gSdlTextureSurface->pixels, gSdlTextureSurface->pitch); renderPresent();
SDL_RenderClear(gSdlRenderer);
SDL_RenderCopy(gSdlRenderer, gSdlTexture, NULL, NULL);
SDL_RenderPresent(gSdlRenderer);
} }
// 0x486900 // 0x486900

46
src/svga.cc
View File

@ -357,10 +357,7 @@ void directDrawSetPaletteInRange(unsigned char* palette, int start, int count)
SDL_SetPaletteColors(gSdlSurface->format->palette, colors, start, count); SDL_SetPaletteColors(gSdlSurface->format->palette, colors, start, count);
SDL_BlitSurface(gSdlSurface, NULL, gSdlTextureSurface, NULL); SDL_BlitSurface(gSdlSurface, NULL, gSdlTextureSurface, NULL);
SDL_UpdateTexture(gSdlTexture, NULL, gSdlTextureSurface->pixels, gSdlTextureSurface->pitch); renderPresent();
SDL_RenderClear(gSdlRenderer);
SDL_RenderCopy(gSdlRenderer, gSdlTexture, NULL, NULL);
SDL_RenderPresent(gSdlRenderer);
} else { } else {
for (int index = start; index < start + count; index++) { for (int index = start; index < start + count; index++) {
unsigned short r = palette[0] << 2; unsigned short r = palette[0] << 2;
@ -404,10 +401,7 @@ void directDrawSetPalette(unsigned char* palette)
SDL_SetPaletteColors(gSdlSurface->format->palette, colors, 0, 256); SDL_SetPaletteColors(gSdlSurface->format->palette, colors, 0, 256);
SDL_BlitSurface(gSdlSurface, NULL, gSdlTextureSurface, NULL); SDL_BlitSurface(gSdlSurface, NULL, gSdlTextureSurface, NULL);
SDL_UpdateTexture(gSdlTexture, NULL, gSdlTextureSurface->pixels, gSdlTextureSurface->pitch); renderPresent();
SDL_RenderClear(gSdlRenderer);
SDL_RenderCopy(gSdlRenderer, gSdlTexture, NULL, NULL);
SDL_RenderPresent(gSdlRenderer);
} else { } else {
for (int index = 0; index < 256; index++) { for (int index = 0; index < 256; index++) {
unsigned short r = palette[index * 3] << 2; unsigned short r = palette[index * 3] << 2;
@ -473,9 +467,7 @@ unsigned char* directDrawGetPalette()
// 0x4CB850 // 0x4CB850
void _GNW95_ShowRect(unsigned char* src, int srcPitch, int a3, int srcX, int srcY, int srcWidth, int srcHeight, int destX, int destY) void _GNW95_ShowRect(unsigned char* src, int srcPitch, int a3, int srcX, int srcY, int srcWidth, int srcHeight, int destX, int destY)
{ {
SDL_LockSurface(gSdlSurface);
blitBufferToBuffer(src + srcPitch * srcY + srcX, srcWidth, srcHeight, srcPitch, (unsigned char*)gSdlSurface->pixels + gSdlSurface->pitch * destY + destX, gSdlSurface->pitch); blitBufferToBuffer(src + srcPitch * srcY + srcX, srcWidth, srcHeight, srcPitch, (unsigned char*)gSdlSurface->pixels + gSdlSurface->pitch * destY + destX, gSdlSurface->pitch);
SDL_UnlockSurface(gSdlSurface);
SDL_Rect srcRect; SDL_Rect srcRect;
srcRect.x = destX; srcRect.x = destX;
@ -487,10 +479,7 @@ void _GNW95_ShowRect(unsigned char* src, int srcPitch, int a3, int srcX, int src
destRect.x = destX; destRect.x = destX;
destRect.y = destY; destRect.y = destY;
SDL_BlitSurface(gSdlSurface, &srcRect, gSdlTextureSurface, &destRect); SDL_BlitSurface(gSdlSurface, &srcRect, gSdlTextureSurface, &destRect);
SDL_UpdateTexture(gSdlTexture, NULL, gSdlTextureSurface->pixels, gSdlTextureSurface->pitch); renderPresent();
SDL_RenderClear(gSdlRenderer);
SDL_RenderCopy(gSdlRenderer, gSdlTexture, NULL, NULL);
SDL_RenderPresent(gSdlRenderer);
} }
// 0x4CB93C // 0x4CB93C
@ -500,7 +489,6 @@ void _GNW95_MouseShowRect16(unsigned char* src, int srcPitch, int a3, int srcX,
return; return;
} }
SDL_LockSurface(gSdlSurface);
unsigned char* dest = (unsigned char*)gSdlSurface->pixels + gSdlSurface->pitch * destY + 2 * destX; unsigned char* dest = (unsigned char*)gSdlSurface->pixels + gSdlSurface->pitch * destY + 2 * destX;
src += srcPitch * srcY + srcX; src += srcPitch * srcY + srcX;
@ -518,8 +506,6 @@ void _GNW95_MouseShowRect16(unsigned char* src, int srcPitch, int a3, int srcX,
src += srcPitch; src += srcPitch;
} }
SDL_UnlockSurface(gSdlSurface);
SDL_Rect srcRect; SDL_Rect srcRect;
srcRect.x = destX; srcRect.x = destX;
srcRect.y = destY; srcRect.y = destY;
@ -530,10 +516,7 @@ void _GNW95_MouseShowRect16(unsigned char* src, int srcPitch, int a3, int srcX,
destRect.x = destX; destRect.x = destX;
destRect.y = destY; destRect.y = destY;
SDL_BlitSurface(gSdlSurface, &srcRect, gSdlTextureSurface, &destRect); SDL_BlitSurface(gSdlSurface, &srcRect, gSdlTextureSurface, &destRect);
SDL_UpdateTexture(gSdlTexture, NULL, gSdlTextureSurface->pixels, gSdlTextureSurface->pitch); renderPresent();
SDL_RenderClear(gSdlRenderer);
SDL_RenderCopy(gSdlRenderer, gSdlTexture, NULL, NULL);
SDL_RenderPresent(gSdlRenderer);
} }
// 0x4CBA44 // 0x4CBA44
@ -549,7 +532,6 @@ void _GNW95_MouseShowTransRect16(unsigned char* src, int srcPitch, int a3, int s
return; return;
} }
SDL_LockSurface(gSdlSurface);
unsigned char* dest = (unsigned char*)gSdlSurface->pixels + gSdlSurface->pitch * destY + 2 * destX; unsigned char* dest = (unsigned char*)gSdlSurface->pixels + gSdlSurface->pitch * destY + 2 * destX;
src += srcPitch * srcY + srcX; src += srcPitch * srcY + srcX;
@ -569,8 +551,6 @@ void _GNW95_MouseShowTransRect16(unsigned char* src, int srcPitch, int a3, int s
src += srcPitch; src += srcPitch;
} }
SDL_UnlockSurface(gSdlSurface);
SDL_Rect srcRect; SDL_Rect srcRect;
srcRect.x = destX; srcRect.x = destX;
srcRect.y = destY; srcRect.y = destY;
@ -581,10 +561,7 @@ void _GNW95_MouseShowTransRect16(unsigned char* src, int srcPitch, int a3, int s
destRect.x = destX; destRect.x = destX;
destRect.y = destY; destRect.y = destY;
SDL_BlitSurface(gSdlSurface, &srcRect, gSdlTextureSurface, &destRect); SDL_BlitSurface(gSdlSurface, &srcRect, gSdlTextureSurface, &destRect);
SDL_UpdateTexture(gSdlTexture, NULL, gSdlTextureSurface->pixels, gSdlTextureSurface->pitch); renderPresent();
SDL_RenderClear(gSdlRenderer);
SDL_RenderCopy(gSdlRenderer, gSdlTexture, NULL, NULL);
SDL_RenderPresent(gSdlRenderer);
} }
// Clears drawing surface. // Clears drawing surface.
@ -607,10 +584,7 @@ void _GNW95_zero_vid_mem()
SDL_UnlockSurface(gSdlSurface); SDL_UnlockSurface(gSdlSurface);
SDL_BlitSurface(gSdlSurface, NULL, gSdlTextureSurface, NULL); SDL_BlitSurface(gSdlSurface, NULL, gSdlTextureSurface, NULL);
SDL_UpdateTexture(gSdlTexture, NULL, gSdlTextureSurface->pixels, gSdlTextureSurface->pitch); renderPresent();
SDL_RenderClear(gSdlRenderer);
SDL_RenderCopy(gSdlRenderer, gSdlTexture, NULL, NULL);
SDL_RenderPresent(gSdlRenderer);
} }
int screenGetWidth() int screenGetWidth()
@ -688,4 +662,12 @@ void handleWindowSizeChanged()
createRenderer(screenGetWidth(), screenGetHeight()); createRenderer(screenGetWidth(), screenGetHeight());
} }
void renderPresent()
{
SDL_UpdateTexture(gSdlTexture, NULL, gSdlTextureSurface->pixels, gSdlTextureSurface->pitch);
SDL_RenderClear(gSdlRenderer);
SDL_RenderCopy(gSdlRenderer, gSdlTexture, NULL, NULL);
SDL_RenderPresent(gSdlRenderer);
}
} // namespace fallout } // namespace fallout

1
src/svga.h
View File

@ -62,6 +62,7 @@ int screenGetWidth();
int screenGetHeight(); int screenGetHeight();
int screenGetVisibleHeight(); int screenGetVisibleHeight();
void handleWindowSizeChanged(); void handleWindowSizeChanged();
void renderPresent();
} // namespace fallout } // namespace fallout