Move DisplayServer enums and typedefs to DisplayServerEnums
This will allow decoupling `display_server.h` from a number of headers in the codebase which only require those enums and not all the DisplayServer API.
This commit is contained in:
@@ -425,7 +425,7 @@ Error GLManagerNative_Windows::_create_context(GLWindow &win, GLDisplay &gl_disp
|
||||
return OK;
|
||||
}
|
||||
|
||||
Error GLManagerNative_Windows::window_create(DisplayServer::WindowID p_window_id, HWND p_hwnd, HINSTANCE p_hinstance, int p_width, int p_height) {
|
||||
Error GLManagerNative_Windows::window_create(DisplayServerEnums::WindowID p_window_id, HWND p_hwnd, HINSTANCE p_hinstance, int p_width, int p_height) {
|
||||
HDC hDC = GetDC(p_hwnd);
|
||||
if (!hDC) {
|
||||
return ERR_CANT_CREATE;
|
||||
@@ -457,7 +457,7 @@ Error GLManagerNative_Windows::window_create(DisplayServer::WindowID p_window_id
|
||||
return OK;
|
||||
}
|
||||
|
||||
void GLManagerNative_Windows::window_destroy(DisplayServer::WindowID p_window_id) {
|
||||
void GLManagerNative_Windows::window_destroy(DisplayServerEnums::WindowID p_window_id) {
|
||||
GLWindow &win = get_window(p_window_id);
|
||||
if (_current_window == &win) {
|
||||
_current_window = nullptr;
|
||||
@@ -477,7 +477,7 @@ void GLManagerNative_Windows::release_current() {
|
||||
_current_window = nullptr;
|
||||
}
|
||||
|
||||
void GLManagerNative_Windows::window_make_current(DisplayServer::WindowID p_window_id) {
|
||||
void GLManagerNative_Windows::window_make_current(DisplayServerEnums::WindowID p_window_id) {
|
||||
if (p_window_id == -1) {
|
||||
return;
|
||||
}
|
||||
@@ -507,7 +507,7 @@ Error GLManagerNative_Windows::initialize() {
|
||||
return OK;
|
||||
}
|
||||
|
||||
void GLManagerNative_Windows::set_use_vsync(DisplayServer::WindowID p_window_id, bool p_use) {
|
||||
void GLManagerNative_Windows::set_use_vsync(DisplayServerEnums::WindowID p_window_id, bool p_use) {
|
||||
GLWindow &win = get_window(p_window_id);
|
||||
|
||||
if (&win != _current_window) {
|
||||
@@ -525,15 +525,15 @@ void GLManagerNative_Windows::set_use_vsync(DisplayServer::WindowID p_window_id,
|
||||
}
|
||||
}
|
||||
|
||||
bool GLManagerNative_Windows::is_using_vsync(DisplayServer::WindowID p_window_id) const {
|
||||
bool GLManagerNative_Windows::is_using_vsync(DisplayServerEnums::WindowID p_window_id) const {
|
||||
return get_window(p_window_id).use_vsync;
|
||||
}
|
||||
|
||||
HDC GLManagerNative_Windows::get_hdc(DisplayServer::WindowID p_window_id) {
|
||||
HDC GLManagerNative_Windows::get_hdc(DisplayServerEnums::WindowID p_window_id) {
|
||||
return get_window(p_window_id).hDC;
|
||||
}
|
||||
|
||||
HGLRC GLManagerNative_Windows::get_hglrc(DisplayServer::WindowID p_window_id) {
|
||||
HGLRC GLManagerNative_Windows::get_hglrc(DisplayServerEnums::WindowID p_window_id) {
|
||||
const GLWindow &win = get_window(p_window_id);
|
||||
const GLDisplay &disp = get_display(win.gldisplay_id);
|
||||
return disp.hRC;
|
||||
|
||||
Reference in New Issue
Block a user