Skip to content

Use SDL_Window as the WindowHandle in Linux and Android. #73

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

Merged
Mr-Wiseguy merged 1 commit into from
Dec 24, 2024
Merged

Use SDL_Window as the WindowHandle in Linux and Android. #73

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
13 changes: 5 additions & 8 deletions ultramodern/include/ultramodern/renderer_context.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
#include "ultra64.h"
#include "config.hpp"

struct SDL_Window;

namespace ultramodern {
namespace renderer {

Expand All @@ -33,14 +35,9 @@ namespace ultramodern {
DWORD thread_id = (DWORD)-1;
auto operator<=>(const WindowHandle&) const = default;
};
#elif defined(__ANDROID__)
using WindowHandle = ANativeWindow*;
#elif defined(__linux__)
struct WindowHandle {
Display* display;
Window window;
auto operator<=>(const WindowHandle&) const = default;
};
// TODO add a native window handle option here (Display/Window for x11 and ANativeWindow for Android) as a compile-time option.
#elif defined(__linux__) || defined(__ANDROID__)
using WindowHandle = SDL_Window*;
#elif defined(__APPLE__)
struct WindowHandle {
void* window;
Expand Down