scratchfoundation/bgfx
1
0
Fork 0
mirror of https://github.com/scratchfoundation/bgfx.git synced 2025-02-17 20:31:57 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed GLFW3 integration on Linux.

Browse source
This commit is contained in:
Branimir Karadžić 2015-03-24 23:21:32 -07:00
parent 0da6c77806
commit 4b60ddf44d
6 changed files with 129 additions and 104 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
include/bgfxplatform.h
View file

@ -55,7 +55,7 @@ namespace bgfx
namespace bgfx namespace bgfx
{ {
/// ///
void x11SetDisplayWindow(void* _display, uint32_t _window); void x11SetDisplayWindow(void* _display, uint32_t _window, void* _glx = NULL);
} // namespace bgfx } // namespace bgfx
@ -156,7 +156,8 @@ namespace bgfx
# if BX_PLATFORM_LINUX || BX_PLATFORM_FREEBSD # if BX_PLATFORM_LINUX || BX_PLATFORM_FREEBSD
::Display* display = glfwGetX11Display(); ::Display* display = glfwGetX11Display();
::Window window = glfwGetX11Window(_window); ::Window window = glfwGetX11Window(_window);
x11SetDisplayWindow(display, window); void* glx = glfwGetGLXContext(_window);
x11SetDisplayWindow(display, window, glx);
# elif BX_PLATFORM_OSX # elif BX_PLATFORM_OSX
void* window = glfwGetCocoaWindow(_window); void* window = glfwGetCocoaWindow(_window);
void* nsgl = glfwGetNSGLContext(_window); void* nsgl = glfwGetNSGLContext(_window);

6
scripts/bgfx.lua
View file

@ -42,6 +42,12 @@ function bgfxProject(_name, _kind, _defines)
_defines, _defines,
} }
if _OPTIONS["with-glfw"] then
defines {
"BGFX_CONFIG_MULTITHREADED=0",
}
end
if _OPTIONS["with-ovr"] then if _OPTIONS["with-ovr"] then
defines { defines {
"BGFX_CONFIG_USE_OVR=1", "BGFX_CONFIG_USE_OVR=1",

9
scripts/genie.lua
View file

@ -134,6 +134,15 @@ function exampleProject(_name)
"glfw3" "glfw3"
} }
configuration { "linux" }
links {
"Xrandr",
"Xinerama",
"Xi",
"Xxf86vm",
"Xcursor",
}
configuration { "osx" } configuration { "osx" }
linkoptions { linkoptions {
"-framework CoreVideo", "-framework CoreVideo",

4
src/bgfx.cpp
View file

@ -44,11 +44,13 @@ namespace bgfx
#elif BX_PLATFORM_LINUX #elif BX_PLATFORM_LINUX
void* g_bgfxX11Display; void* g_bgfxX11Display;
uint32_t g_bgfxX11Window; uint32_t g_bgfxX11Window;
void* g_bgfxGLX;
void x11SetDisplayWindow(void* _display, uint32_t _window) void x11SetDisplayWindow(void* _display, uint32_t _window, void* _glx)
{ {
g_bgfxX11Display = _display; g_bgfxX11Display = _display;
g_bgfxX11Window = _window; g_bgfxX11Window = _window;
g_bgfxGLX = _glx;
} }
#elif BX_PLATFORM_OSX #elif BX_PLATFORM_OSX
void* g_bgfxNSWindow = NULL; void* g_bgfxNSWindow = NULL;

1
src/bgfx_p.h
View file

@ -204,6 +204,7 @@ namespace bgfx
#elif BX_PLATFORM_LINUX #elif BX_PLATFORM_LINUX
extern void* g_bgfxX11Display; extern void* g_bgfxX11Display;
extern uint32_t g_bgfxX11Window; extern uint32_t g_bgfxX11Window;
extern void* g_bgfxGLX;
#elif BX_PLATFORM_OSX #elif BX_PLATFORM_OSX
extern void* g_bgfxNSWindow; extern void* g_bgfxNSWindow;
extern void* g_bgfxNSGL; extern void* g_bgfxNSGL;

6
src/glcontext_glx.cpp
View file

@ -55,6 +55,11 @@ namespace bgfx { namespace gl
void GlContext::create(uint32_t _width, uint32_t _height) void GlContext::create(uint32_t _width, uint32_t _height)
{ {
BX_UNUSED(_width, _height); BX_UNUSED(_width, _height);
m_context = (GLXContext)g_bgfxGLX;
if (NULL == m_context)
{
XLockDisplay( (::Display*)g_bgfxX11Display); XLockDisplay( (::Display*)g_bgfxX11Display);
int major, minor; int major, minor;
@ -171,6 +176,7 @@ namespace bgfx { namespace gl
#endif // BGFX_CONFIG_RENDERER_OPENGL >= 31 #endif // BGFX_CONFIG_RENDERER_OPENGL >= 31
XUnlockDisplay( (::Display*)g_bgfxX11Display); XUnlockDisplay( (::Display*)g_bgfxX11Display);
}
import(); import();