[Bf-blender-cvs] [57d9f004aa5] soc-2019-openxr: Fix compile/CMake errors and warnings on Linux
Julian Eisel
noreply at git.blender.org
Thu Jun 27 19:56:06 CEST 2019
Commit: 57d9f004aa55ecb0f564b2e4199a1821d69fbbc6
Author: Julian Eisel
Date: Thu Jun 27 19:54:05 2019 +0200
Branches: soc-2019-openxr
https://developer.blender.org/rB57d9f004aa55ecb0f564b2e4199a1821d69fbbc6
Fix compile/CMake errors and warnings on Linux
===================================================================
R092 intern/ghost/intern/GHOST_IXRGraphicsBinding.h intern/ghost/intern/GHOST_IXrGraphicsBinding.h
R099 intern/ghost/intern/GHOST_XR.cpp intern/ghost/intern/GHOST_Xr.cpp
R098 intern/ghost/intern/GHOST_XREvent.cpp intern/ghost/intern/GHOST_XrEvent.cpp
R092 intern/ghost/intern/GHOST_XRGraphicsBinding.cpp intern/ghost/intern/GHOST_XrGraphicsBinding.cpp
R098 intern/ghost/intern/GHOST_XRSession.cpp intern/ghost/intern/GHOST_XrSession.cpp
R097 intern/ghost/intern/GHOST_XR_intern.h intern/ghost/intern/GHOST_Xr_intern.h
R100 intern/ghost/intern/GHOST_XR_openxr_includes.h intern/ghost/intern/GHOST_Xr_openxr_includes.h
M release/scripts/addons
M source/blender/windowmanager/intern/wm_xr.c
M source/tools
===================================================================
diff --git a/intern/ghost/intern/GHOST_IXRGraphicsBinding.h b/intern/ghost/intern/GHOST_IXrGraphicsBinding.h
similarity index 92%
rename from intern/ghost/intern/GHOST_IXRGraphicsBinding.h
rename to intern/ghost/intern/GHOST_IXrGraphicsBinding.h
index 60b2304b239..6bb53b3b6ba 100644
--- a/intern/ghost/intern/GHOST_IXRGraphicsBinding.h
+++ b/intern/ghost/intern/GHOST_IXrGraphicsBinding.h
@@ -23,7 +23,7 @@
#include <memory>
#include <vector>
-#include "GHOST_XR_openxr_includes.h"
+#include "GHOST_Xr_openxr_includes.h"
class GHOST_IXrGraphicsBinding {
friend std::unique_ptr<GHOST_IXrGraphicsBinding> GHOST_XrGraphicsBindingCreateFromType(
@@ -52,4 +52,7 @@ class GHOST_IXrGraphicsBinding {
GHOST_IXrGraphicsBinding() = default;
};
+std::unique_ptr<GHOST_IXrGraphicsBinding> GHOST_XrGraphicsBindingCreateFromType(
+ GHOST_TXrGraphicsBinding type);
+
#endif /* __GHOST_IXRGRAPHICSBINDING_H__ */
diff --git a/intern/ghost/intern/GHOST_XR.cpp b/intern/ghost/intern/GHOST_Xr.cpp
similarity index 99%
rename from intern/ghost/intern/GHOST_XR.cpp
rename to intern/ghost/intern/GHOST_Xr.cpp
index 633de1dde16..9e77443edb0 100644
--- a/intern/ghost/intern/GHOST_XR.cpp
+++ b/intern/ghost/intern/GHOST_Xr.cpp
@@ -25,7 +25,7 @@
#include "GHOST_C-api.h"
-#include "GHOST_XR_intern.h"
+#include "GHOST_Xr_intern.h"
/* Toggle printing of available OpenXR extensions and API-layers. Should probably be changed to use
* CLOG at some point */
diff --git a/intern/ghost/intern/GHOST_XREvent.cpp b/intern/ghost/intern/GHOST_XrEvent.cpp
similarity index 98%
rename from intern/ghost/intern/GHOST_XREvent.cpp
rename to intern/ghost/intern/GHOST_XrEvent.cpp
index 6d53d5b6adb..b3ea35194f7 100644
--- a/intern/ghost/intern/GHOST_XREvent.cpp
+++ b/intern/ghost/intern/GHOST_XrEvent.cpp
@@ -21,7 +21,7 @@
#include <iostream>
#include "GHOST_C-api.h"
-#include "GHOST_XR_intern.h"
+#include "GHOST_Xr_intern.h"
static bool GHOST_XrEventPollNext(OpenXRData *oxr, XrEventDataBuffer &r_event_data)
{
diff --git a/intern/ghost/intern/GHOST_XRGraphicsBinding.cpp b/intern/ghost/intern/GHOST_XrGraphicsBinding.cpp
similarity index 92%
rename from intern/ghost/intern/GHOST_XRGraphicsBinding.cpp
rename to intern/ghost/intern/GHOST_XrGraphicsBinding.cpp
index ee1655a2150..22f5e80c7ca 100644
--- a/intern/ghost/intern/GHOST_XRGraphicsBinding.cpp
+++ b/intern/ghost/intern/GHOST_XrGraphicsBinding.cpp
@@ -28,13 +28,13 @@
# include "GHOST_ContextD3D.h"
#endif
#include "GHOST_C-api.h"
-#include "GHOST_XR_intern.h"
+#include "GHOST_Xr_intern.h"
-#include "GHOST_IXRGraphicsBinding.h"
+#include "GHOST_IXrGraphicsBinding.h"
-bool choose_swapchain_format_from_candidates(std::vector<int64_t> gpu_binding_formats,
- std::vector<int64_t> runtime_formats,
- int64_t *r_result)
+static bool choose_swapchain_format_from_candidates(std::vector<int64_t> gpu_binding_formats,
+ std::vector<int64_t> runtime_formats,
+ int64_t *r_result)
{
if (gpu_binding_formats.empty()) {
return false;
@@ -161,9 +161,8 @@ class GHOST_XrGraphicsBindingD3D : public GHOST_IXrGraphicsBinding {
const CD3D11_RENDER_TARGET_VIEW_DESC render_target_view_desc(D3D11_RTV_DIMENSION_TEXTURE2D,
DXGI_FORMAT_R8G8B8A8_UNORM);
ID3D11RenderTargetView *render_target_view;
- m_ghost_ctx->m_device->CreateRenderTargetView(d3d_swapchain_image->texture,
- &render_target_view_desc,
- &render_target_view);
+ m_ghost_ctx->m_device->CreateRenderTargetView(
+ d3d_swapchain_image->texture, &render_target_view_desc, &render_target_view);
const float clear_col[] = {0.2f, 0.5f, 0.8f, 1.0f};
m_ghost_ctx->m_device_ctx->ClearRenderTargetView(render_target_view, clear_col);
diff --git a/intern/ghost/intern/GHOST_XRSession.cpp b/intern/ghost/intern/GHOST_XrSession.cpp
similarity index 98%
rename from intern/ghost/intern/GHOST_XRSession.cpp
rename to intern/ghost/intern/GHOST_XrSession.cpp
index be7a7849929..9040026cfa8 100644
--- a/intern/ghost/intern/GHOST_XRSession.cpp
+++ b/intern/ghost/intern/GHOST_XrSession.cpp
@@ -24,9 +24,9 @@
#include "GHOST_C-api.h"
-#include "GHOST_IXRGraphicsBinding.h"
+#include "GHOST_IXrGraphicsBinding.h"
-#include "GHOST_XR_intern.h"
+#include "GHOST_Xr_intern.h"
GHOST_TSuccess GHOST_XrSessionIsRunning(const GHOST_XrContext *xr_context)
{
@@ -227,7 +227,8 @@ static void drawing_begin(GHOST_XrContext *xr_context)
xr_context->draw_frame->frame_state = frame_state;
}
-void drawing_end(GHOST_XrContext *xr_context, std::vector<XrCompositionLayerBaseHeader *> *layers)
+static void drawing_end(GHOST_XrContext *xr_context,
+ std::vector<XrCompositionLayerBaseHeader *> *layers)
{
XrFrameEndInfo end_info{XR_TYPE_FRAME_END_INFO};
diff --git a/intern/ghost/intern/GHOST_XR_intern.h b/intern/ghost/intern/GHOST_Xr_intern.h
similarity index 97%
rename from intern/ghost/intern/GHOST_XR_intern.h
rename to intern/ghost/intern/GHOST_Xr_intern.h
index 83205ec28dd..fb7ee92ba14 100644
--- a/intern/ghost/intern/GHOST_XR_intern.h
+++ b/intern/ghost/intern/GHOST_Xr_intern.h
@@ -25,8 +25,8 @@
#include <memory>
#include <vector>
-#include "GHOST_XR_openxr_includes.h"
-#include "GHOST_IXRGraphicsBinding.h"
+#include "GHOST_Xr_openxr_includes.h"
+#include "GHOST_IXrGraphicsBinding.h"
typedef struct OpenXRData {
XrInstance instance;
diff --git a/intern/ghost/intern/GHOST_XR_openxr_includes.h b/intern/ghost/intern/GHOST_Xr_openxr_includes.h
similarity index 100%
rename from intern/ghost/intern/GHOST_XR_openxr_includes.h
rename to intern/ghost/intern/GHOST_Xr_openxr_includes.h
diff --git a/release/scripts/addons b/release/scripts/addons
index 0e53a9a3867..3687f02a662 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit 0e53a9a38672790d5fbb9a1d4a935980824d4a84
+Subproject commit 3687f02a662d6c258cb72e36127cff1fb7fe3236
diff --git a/source/blender/windowmanager/intern/wm_xr.c b/source/blender/windowmanager/intern/wm_xr.c
index 5a07a3b46e6..3a6f181eafa 100644
--- a/source/blender/windowmanager/intern/wm_xr.c
+++ b/source/blender/windowmanager/intern/wm_xr.c
@@ -22,6 +22,10 @@
#include "GHOST_C-api.h"
+#include "WM_types.h"
+#include "WM_api.h"
+
+#include "wm.h"
void wm_xr_session_draw(bContext *C, struct GHOST_XrContext *xr_context)
{
diff --git a/source/tools b/source/tools
index eb406b701d5..281c63156c6 160000
--- a/source/tools
+++ b/source/tools
@@ -1 +1 @@
-Subproject commit eb406b701d5a251818e425fec489417477019d61
+Subproject commit 281c63156c61573a10a6197a149cde00debbf675
More information about the Bf-blender-cvs
mailing list