Merge commit '3a7f96fd99528968c39b5be81db067ca018d432b' into dev
This commit is contained in:
7
external/SDL/test/testnative.c
vendored
7
external/SDL/test/testnative.c
vendored
@@ -117,9 +117,6 @@ int main(int argc, char *argv[])
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* Enable standard application logging */
|
||||
SDL_SetLogPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_INFO);
|
||||
|
||||
/* Parse commandline */
|
||||
if (!SDLTest_CommonDefaultArgs(state, argc, argv)) {
|
||||
return 1;
|
||||
@@ -152,7 +149,7 @@ int main(int argc, char *argv[])
|
||||
}
|
||||
props = SDL_CreateProperties();
|
||||
SDL_SetPointerProperty(props, "sdl2-compat.external_window", native_window);
|
||||
SDL_SetBooleanProperty(props, SDL_PROP_WINDOW_CREATE_OPENGL_BOOLEAN, SDL_TRUE);
|
||||
SDL_SetBooleanProperty(props, SDL_PROP_WINDOW_CREATE_OPENGL_BOOLEAN, true);
|
||||
SDL_SetNumberProperty(props, SDL_PROP_WINDOW_CREATE_WIDTH_NUMBER, WINDOW_W);
|
||||
SDL_SetNumberProperty(props, SDL_PROP_WINDOW_CREATE_HEIGHT_NUMBER, WINDOW_H);
|
||||
window = SDL_CreateWindowWithProperties(props);
|
||||
@@ -174,7 +171,7 @@ int main(int argc, char *argv[])
|
||||
SDL_SetRenderDrawColor(renderer, 0xA0, 0xA0, 0xA0, 0xFF);
|
||||
SDL_RenderClear(renderer);
|
||||
|
||||
sprite = LoadTexture(renderer, "icon.bmp", SDL_TRUE, NULL, NULL);
|
||||
sprite = LoadTexture(renderer, "icon.bmp", true, NULL, NULL);
|
||||
if (!sprite) {
|
||||
quit(6);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user