Skip to content

SDLWindow: MSAA fallback retry + null-safe CreateWindow #2059

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

Open
AxGord wants to merge 1 commit into
base: develop
Choose a base branch
from
+23 −5
Open

SDLWindow: MSAA fallback retry + null-safe CreateWindow #2059

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
28 changes: 23 additions & 5 deletions project/src/backend/sdl/SDLWindow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,15 @@ namespace lime {
}
#endif

if (!sdlWindow && (flags & (WINDOW_FLAG_HW_AA | WINDOW_FLAG_HW_AA_HIRES))) {

// Retry without antialiasing — emulators and some devices don't support MSAA
SDL_GL_SetAttribute (SDL_GL_MULTISAMPLEBUFFERS, 0);
SDL_GL_SetAttribute (SDL_GL_MULTISAMPLESAMPLES, 0);
sdlWindow = SDL_CreateWindow (title, SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, width, height, sdlWindowFlags);

}

if (!sdlWindow) {

printf ("Could not create SDL window: %s.\n", SDL_GetError ());
Expand Down Expand Up @@ -584,8 +593,8 @@ namespace lime {

int SDLWindow::GetHeight () {

int width;
int height;
int width = 0;
int height = 0;

SDL_GetWindowSize (sdlWindow, &width, &height);

Expand Down Expand Up @@ -667,8 +676,8 @@ namespace lime {

int SDLWindow::GetWidth () {

int width;
int height;
int width = 0;
int height = 0;

SDL_GetWindowSize (sdlWindow, &width, &height);

Expand Down Expand Up @@ -1133,7 +1142,16 @@ namespace lime {

Window* CreateWindow (Application* application, int width, int height, int flags, const char* title) {

return new SDLWindow (application, width, height, flags, title);
SDLWindow* window = new SDLWindow (application, width, height, flags, title);

if (!window->sdlWindow) {

delete window;
return NULL;

}

return window;

}

Expand Down