[Bf-blender-cvs] [e9832f053b0] soc-2019-openxr: Merge branch 'master' into soc-2019-openxr
Julian Eisel
noreply at git.blender.org
Thu Oct 10 11:30:27 CEST 2019
Commit: e9832f053b06e14d45d774e3f9ad3f9449b8dedb
Author: Julian Eisel
Date: Thu Oct 10 11:30:14 2019 +0200
Branches: soc-2019-openxr
https://developer.blender.org/rBe9832f053b06e14d45d774e3f9ad3f9449b8dedb
Merge branch 'master' into soc-2019-openxr
===================================================================
===================================================================
diff --cc build_files/build_environment/cmake/versions.cmake
index 862327d83ac,1c9e5c5a4f6..781f9cad863
--- a/build_files/build_environment/cmake/versions.cmake
+++ b/build_files/build_environment/cmake/versions.cmake
@@@ -307,6 -311,10 +311,14 @@@ set(OIDN_VERSION 1.0.0
set(OIDN_URI https://github.com/OpenImageDenoise/oidn/releases/download/v${OIDN_VERSION}/oidn-${OIDN_VERSION}.src.zip)
set(OIDN_HASH 19fe67b0164e8f020ac8a4f520defe60)
+ set(LIBGLU_VERSION 9.0.1)
+ set(LIBGLU_URI ftp://ftp.freedesktop.org/pub/mesa/glu/glu-${LIBGLU_VERSION}.tar.xz)
+ set(LIBGLU_HASH 151aef599b8259efe9acd599c96ea2a3)
+
+ set(MESA_VERSION 18.3.1)
+ set(MESA_URI ftp://ftp.freedesktop.org/pub/mesa//mesa-${MESA_VERSION}.tar.xz)
+ set(MESA_HASH d60828056d77bfdbae0970f9b15fb1be)
++
+set(OPENXR_SDK_VERSION 1.0.0)
+set(OPENXR_SDK_URI https://github.com/KhronosGroup/OpenXR-SDK-Source/archive/release-${OPENXR_SDK_VERSION}.tar.gz)
+set(OPENXR_SDK_HASH 260bdc87b5a9b7ef35a540e39f875d79)
diff --cc intern/ghost/GHOST_C-api.h
index 3ea2faf4afe,720929ce945..fb46e0b2031
--- a/intern/ghost/GHOST_C-api.h
+++ b/intern/ghost/GHOST_C-api.h
@@@ -211,11 -238,8 +242,13 @@@ extern GHOST_TUserDataPtr GHOST_GetWind
*/
extern void GHOST_SetWindowUserData(GHOST_WindowHandle windowhandle, GHOST_TUserDataPtr userdata);
+ extern int GHOST_IsDialogWindow(GHOST_WindowHandle windowhandle);
+
+/**
+ * Returns whether a window is rendered upside down compared to OpenGL.
+ */
+extern int GHOST_isUpsideDownWindow(GHOST_WindowHandle windowhandle);
+
/**
* Dispose a window.
* \param systemhandle The handle to the system
diff --cc intern/ghost/GHOST_IWindow.h
index a257116cba1,c19d4bdf6bd..c9187fde231
--- a/intern/ghost/GHOST_IWindow.h
+++ b/intern/ghost/GHOST_IWindow.h
@@@ -241,11 -241,8 +241,13 @@@ class GHOST_IWindow
*/
virtual void setUserData(const GHOST_TUserDataPtr userData) = 0;
+ virtual bool isDialog() const = 0;
+
+ /**
+ * Returns if the window is rendered upside down compared to OpenGL.
+ */
+ virtual bool isUpsideDown() const = 0;
+
/**
* Returns the tablet data (pressure etc).
* \return The tablet data (pressure etc).
diff --cc intern/ghost/intern/GHOST_C-api.cpp
index 2b98b5e66f7,eeb23ea7471..dee9daa34c9
--- a/intern/ghost/intern/GHOST_C-api.cpp
+++ b/intern/ghost/intern/GHOST_C-api.cpp
@@@ -179,13 -194,13 +217,20 @@@ void GHOST_SetWindowUserData(GHOST_Wind
window->setUserData(userdata);
}
+ int GHOST_IsDialogWindow(GHOST_WindowHandle windowhandle)
+ {
+ GHOST_IWindow *window = (GHOST_IWindow *)windowhandle;
+
+ return (int)window->isDialog();
+ }
+
+int GHOST_isUpsideDownWindow(GHOST_WindowHandle windowhandle)
+{
+ GHOST_IWindow *window = (GHOST_IWindow *)windowhandle;
+
+ return window->isUpsideDown();
+}
+
GHOST_TSuccess GHOST_DisposeWindow(GHOST_SystemHandle systemhandle,
GHOST_WindowHandle windowhandle)
{
diff --cc intern/ghost/intern/GHOST_WindowWin32.cpp
index d0b00063294,e1c6aa1109c..e4ec2e0aa29
--- a/intern/ghost/intern/GHOST_WindowWin32.cpp
+++ b/intern/ghost/intern/GHOST_WindowWin32.cpp
@@@ -23,7 -23,7 +23,8 @@@
#define _USE_MATH_DEFINES
+#include "GHOST_ContextD3D.h"
+ #include "GHOST_WindowManager.h"
#include "GHOST_WindowWin32.h"
#include "GHOST_SystemWin32.h"
#include "GHOST_DropTargetWin32.h"
diff --cc source/blender/windowmanager/WM_api.h
index bd1b9cfbe84,f8b6b5171da..815f8ecc466
--- a/source/blender/windowmanager/WM_api.h
+++ b/source/blender/windowmanager/WM_api.h
@@@ -152,23 -154,16 +154,20 @@@ void *WM_opengl_context_create(void)
void WM_opengl_context_dispose(void *context);
void WM_opengl_context_activate(void *context);
void WM_opengl_context_release(void *context);
+#ifdef WIN32
+void *WM_directx_context_create(void);
+void WM_directx_context_dispose(void *context);
+#endif
- /* defines for 'type' WM_window_open_temp */
- enum {
- WM_WINDOW_RENDER = 1,
- WM_WINDOW_USERPREFS,
- WM_WINDOW_DRIVERS,
- WM_WINDOW_INFO,
- WM_WINDOW_FILESEL,
- };
-
struct wmWindow *WM_window_open(struct bContext *C, const struct rcti *rect);
- struct wmWindow *WM_window_open_temp(
- struct bContext *C, int x, int y, int sizex, int sizey, int type);
+ struct wmWindow *WM_window_open_temp(struct bContext *C,
+ const char *title,
+ int x,
+ int y,
+ int sizex,
+ int sizey,
+ int space_type,
+ bool dialog);
void WM_window_set_dpi(wmWindow *win);
bool WM_stereo3d_enabled(struct wmWindow *win, bool only_fullscreen_test);
diff --cc source/blender/windowmanager/intern/wm_init_exit.c
index cbea3e9b876,c8c35ba1bfc..bee007bde7f
--- a/source/blender/windowmanager/intern/wm_init_exit.c
+++ b/source/blender/windowmanager/intern/wm_init_exit.c
@@@ -98,8 -98,8 +98,9 @@@
#include "wm_event_system.h"
#include "wm.h"
#include "wm_files.h"
+#include "wm_surface.h"
#include "wm_window.h"
+ #include "wm_platform_support.h"
#include "ED_anim_api.h"
#include "ED_armature.h"
diff --cc source/blender/windowmanager/intern/wm_window.c
index 6612c609b3d,fa2320585d7..111554868d4
--- a/source/blender/windowmanager/intern/wm_window.c
+++ b/source/blender/windowmanager/intern/wm_window.c
@@@ -2443,25 -2433,14 +2439,35 @@@ void WM_opengl_context_release(void *co
GHOST_ReleaseOpenGLContext((GHOST_ContextHandle)context);
}
+ void WM_ghost_show_message_box(const char *title,
+ const char *message,
+ const char *help_label,
+ const char *continue_label,
+ const char *link,
+ GHOST_DialogOptions dialog_options)
+ {
+ BLI_assert(g_system);
+ GHOST_ShowMessageBox(g_system, title, message, help_label, continue_label, link, dialog_options);
+ }
/** \} */
+
+#ifdef WIN32
+/* -------------------------------------------------------------------- */
+/** \name Direct DirectX Context Management
+ * \{ */
+
+void *WM_directx_context_create(void)
+{
+ BLI_assert(GPU_framebuffer_active_get() == NULL);
+ return GHOST_CreateDirectXContext(g_system);
+}
+
+void WM_directx_context_dispose(void *context)
+{
+ BLI_assert(GPU_framebuffer_active_get() == NULL);
+ GHOST_DisposeDirectXContext(g_system, context);
+}
+
+/** \} */
+
+#endif
More information about the Bf-blender-cvs
mailing list