Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

sdl: add blitting to avoid event handling issues #174

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

sdl: add blitting to avoid event handling issues #174

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 15 additions & 10 deletions TotalCrossVM/src/init/tcsdl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,8 +139,6 @@ bool TCSDL_Init(ScreenSurface screen, const char* title, bool fullScreen) {
std::cerr << "SDL_CreateTexturet(): " << SDL_GetError() << '\n';
return false;
}
} else {
surface = SDL_GetWindowSurface(window);
}

// Get pixel format struct
Expand All @@ -161,14 +159,9 @@ bool TCSDL_Init(ScreenSurface screen, const char* title, bool fullScreen) {
// pixel order
screen->pixelformat = windowPixelFormat;

if (usesTexture) {
// Adjusts screen's pixel surface
if (IS_NULL(screen->pixels = (uint8*) malloc(screen->pitch * screen->screenH))) {
std::cerr << "Failed to alloc " << (screen->pitch * screen->screenH) << " bytes for pixel surface" << '\n';
return false;
}
}else {
screen->pixels = (uint8*) surface->pixels;
if (IS_NULL(screen->pixels = (uint8*) malloc(screen->pitch * screen->screenH))) {
std::cerr << "Failed to alloc " << (screen->pitch * screen->screenH) << " bytes for pixel surface" << '\n';
return false;
}

if (IS_NULL(screen->extension = (ScreenSurfaceEx) malloc(sizeof(TScreenSurfaceEx)))) {
Expand All @@ -178,6 +171,15 @@ bool TCSDL_Init(ScreenSurface screen, const char* title, bool fullScreen) {
std::cerr << "Failed to alloc TScreenSurfaceEx of " << sizeof(TScreenSurfaceEx) << " bytes" << '\n';
return false;
}

surface = SDL_CreateRGBSurfaceWithFormatFrom(
screen->pixels,
screen->screenW,
screen->screenH,
screen->bpp,
screen->pitch,
windowPixelFormat);

SCREEN_EX(screen)->window = window;
SCREEN_EX(screen)->renderer = renderer;
SCREEN_EX(screen)->texture = texture;
Expand All @@ -200,6 +202,9 @@ void TCSDL_UpdateTexture(int w, int h, int pitch, void* pixels) {
if(usesTexture) {
// Update the given texture rectangle with new pixel data.
SDL_UpdateTexture(texture, NULL, pixels, pitch);
} else {
// Copy virtual surface to window surface
SDL_BlitSurface(surface, NULL, SDL_GetWindowSurface(window), NULL);
}
// Call SDL render present
TCSDL_Present();
Expand Down