BlackMATov/enduro2d
1
0
Fork 0
mirror of https://github.com/enduro2d/enduro2d.git synced 2025-12-15 00:11:55 +07:00
Code Issues Packages Projects Releases Wiki Activity

update modules

Browse Source
This commit is contained in:
Matvey Cherevko
2018-10-26 22:32:29 +07:00
parent 3964430ace
commit ed917915fa
5 changed files with 6 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/catch2

Submodule modules/catch2 updated: 1faccd601d...544c7d7cbf

2
modules/glfw

Submodule modules/glfw updated: 2de2589f91...5595fa3ae6

4
sources/3rdparty/glfw/glfw3.h vendored
View File

@@ -4928,8 +4928,6 @@ GLFWAPI int glfwGetGamepadState(int jid, GLFWgamepadstate* state);
* @errors Possible errors include @ref GLFW_NOT_INITIALIZED and @ref
* GLFW_PLATFORM_ERROR.
*
* @remark @wayland Clipboard is currently unimplemented.
*
* @pointer_lifetime The specified string is copied before this function
* returns.
*
@@ -4958,8 +4956,6 @@ GLFWAPI void glfwSetClipboardString(GLFWwindow* window, const char* string);
* @errors Possible errors include @ref GLFW_NOT_INITIALIZED and @ref
* GLFW_PLATFORM_ERROR.
*
* @remark @wayland Clipboard is currently unimplemented.
*
* @pointer_lifetime The returned string is allocated and freed by GLFW. You
* should not free it yourself. It is valid until the next call to @ref
* glfwGetClipboardString or @ref glfwSetClipboardString, or until the library

8
sources/3rdparty/glfw/glfw3native.h vendored
View File

@@ -81,7 +81,7 @@ extern "C" {
* System headers and types
*************************************************************************/
#if defined(GLFW_EXPOSE_NATIVE_WIN32)
#if defined(GLFW_EXPOSE_NATIVE_WIN32) || defined(GLFW_EXPOSE_NATIVE_WGL)
// This is a workaround for the fact that glfw3.h needs to export APIENTRY (for
// example to allow applications to correctly declare a GL_ARB_debug_output
// callback) but windows.h assumes no one will define APIENTRY before it does
@@ -90,14 +90,14 @@ extern "C" {
#undef GLFW_APIENTRY_DEFINED
#endif
#include <windows.h>
#elif defined(GLFW_EXPOSE_NATIVE_COCOA)
#include <ApplicationServices/ApplicationServices.h>
#elif defined(GLFW_EXPOSE_NATIVE_COCOA) || defined(GLFW_EXPOSE_NATIVE_NSGL)
#if defined(__OBJC__)
#import <Cocoa/Cocoa.h>
#else
#include <ApplicationServices/ApplicationServices.h>
typedef void* id;
#endif
#elif defined(GLFW_EXPOSE_NATIVE_X11)
#elif defined(GLFW_EXPOSE_NATIVE_X11) || defined(GLFW_EXPOSE_NATIVE_GLX)
#include <X11/Xlib.h>
#include <X11/extensions/Xrandr.h>
#elif defined(GLFW_EXPOSE_NATIVE_WAYLAND)

20
sources/enduro2d/core/window_impl/window_glfw.cpp
View File

@@ -241,25 +241,6 @@ namespace
return keyboard_key_action::unknown;
}
}
#if defined(E2D_PLATFORM) && E2D_PLATFORM == E2D_PLATFORM_MACOSX
// https://github.com/glfw/glfw/issues/1334
void glfw_issue_1334(GLFWwindow* window) noexcept {
E2D_ASSERT(window);
static i32 done_count = 0;
if ( done_count < 2 ) {
int x, y;
glfwGetWindowPos(window, &x, &y);
int nx = x + (done_count ? 1 : -1);
glfwSetWindowPos(window, nx, y);
done_count++;
}
}
#else
void glfw_issue_1334(GLFWwindow* window) noexcept {
E2D_UNUSED(window);
}
#endif
}
namespace e2d
@@ -591,7 +572,6 @@ namespace e2d
E2D_ASSERT(state_->window);
glfwSwapInterval(vsync ? 1 : 0);
glfwSwapBuffers(state_->window.get());
glfw_issue_1334(state_->window.get());
}
bool window::poll_events() noexcept {