wayland: Fix build errors

This commit is contained in:
Reg Tiangha 2024-06-11 16:16:27 -06:00
parent 2a2281c2e1
commit 7883d3c8c8
No known key found for this signature in database
GPG key ID: 00D437798B1C2970
5 changed files with 6 additions and 5 deletions

View file

@ -212,6 +212,9 @@ if(UNIX AND NOT APPLE AND NOT ANDROID)
target_include_directories(citra_common PRIVATE "${X11_INCLUDE_DIR}")
add_compile_definitions(QAPPLICATION_CLASS=QApplication)
if (ENABLE_OPENGL)
target_link_libraries(citra_common PRIVATE glad)
endif()
endif()
create_target_directory_groups(citra_common)

View file

@ -7,7 +7,6 @@
#include "window_info.h"
namespace GL {
using namespace citra;
class Context {
public:
Context(const WindowInfo& wi);

View file

@ -69,7 +69,7 @@ bool ContextGLX::Initialize(const Version* versions_to_try, size_t num_versions_
}
void* ContextGLX::GetProcAddress(const char* name) {
return reinterpret_cast<void*>(glXGetProcAddress(reinterpret_cast<const GLubyte*>(name)));
return reinterpret_cast<void*>(glXGetProcAddressARB(reinterpret_cast<const GLubyte*>(name)));
}
bool ContextGLX::ChangeSurface(const WindowInfo& new_wi) {

View file

@ -18,8 +18,8 @@ struct WindowInfo {
Type type = Type::Surfaceless;
void* display_connection = nullptr;
void* window_handle = nullptr;
citra::u32 surface_width = 0;
citra::u32 surface_height = 0;
u32 surface_width = 0;
u32 surface_height = 0;
float surface_refresh_rate = 0.0f;
float surface_scale = 1.0f;
SurfaceFormat surface_format = SurfaceFormat::RGB8;

View file

@ -4,7 +4,6 @@
#include "duckstation_compat.h"
namespace GL {
using namespace citra;
class X11Window {
public:
X11Window();