[Bf-blender-cvs] [7ec30239266] vamr-openxr-module: Rename internal VAMR files (mainly removes VAMR_ prefix)
Julian Eisel
noreply at git.blender.org
Sat Aug 31 14:50:47 CEST 2019
Commit: 7ec30239266a04ae5feb066d8d9b9c9f77b751c9
Author: Julian Eisel
Date: Sat Aug 31 14:39:56 2019 +0200
Branches: vamr-openxr-module
https://developer.blender.org/rB7ec30239266a04ae5feb066d8d9b9c9f77b751c9
Rename internal VAMR files (mainly removes VAMR_ prefix)
Also rename VAMR_internal.h to utils.h and move OpenXR include out of
it.
===================================================================
M intern/vamr/CMakeLists.txt
R098 intern/vamr/intern/VAMR_capi.cc intern/vamr/intern/CAPI.cc
R099 intern/vamr/intern/VAMR_Context.cc intern/vamr/intern/Context.cc
R098 intern/vamr/intern/VAMR_Context.h intern/vamr/intern/Context.h
R096 intern/vamr/intern/VAMR_Event.cc intern/vamr/intern/Event.cc
R093 intern/vamr/intern/VAMR_Exception.h intern/vamr/intern/Exception.h
R099 intern/vamr/intern/VAMR_GraphicsBinding.cc intern/vamr/intern/GraphicsBinding.cc
R094 intern/vamr/intern/VAMR_IGraphicsBinding.h intern/vamr/intern/IGraphicsBinding.h
R099 intern/vamr/intern/VAMR_Session.cc intern/vamr/intern/Session.cc
R096 intern/vamr/intern/VAMR_Session.h intern/vamr/intern/Session.h
M intern/vamr/intern/VAMR.cc
R100 intern/vamr/intern/VAMR_openxr_includes.h intern/vamr/intern/openxr_includes.h
R096 intern/vamr/intern/VAMR_intern.h intern/vamr/intern/utils.h
===================================================================
diff --git a/intern/vamr/CMakeLists.txt b/intern/vamr/CMakeLists.txt
index 71fc535f2af..17765df91e8 100644
--- a/intern/vamr/CMakeLists.txt
+++ b/intern/vamr/CMakeLists.txt
@@ -26,21 +26,21 @@ set(INC_SYS
set(SRC
intern/VAMR.cc
- intern/VAMR_capi.cc
- intern/VAMR_Context.cc
- intern/VAMR_Event.cc
- intern/VAMR_GraphicsBinding.cc
- intern/VAMR_Session.cc
+ intern/CAPI.cc
+ intern/Context.cc
+ intern/Event.cc
+ intern/GraphicsBinding.cc
+ intern/Session.cc
VAMR_capi.h
VAMR_IContext.h
VAMR_Types.h
- intern/VAMR_Context.h
- intern/VAMR_Exception.h
- intern/VAMR_intern.h
- intern/VAMR_IGraphicsBinding.h
- intern/VAMR_openxr_includes.h
- intern/VAMR_Session.h
+ intern/Context.h
+ intern/Exception.h
+ intern/utils.h
+ intern/IGraphicsBinding.h
+ intern/openxr_includes.h
+ intern/Session.h
)
if(WIN32)
diff --git a/intern/vamr/intern/VAMR_capi.cc b/intern/vamr/intern/CAPI.cc
similarity index 98%
rename from intern/vamr/intern/VAMR_capi.cc
rename to intern/vamr/intern/CAPI.cc
index dc4f8d51943..575884aee61 100644
--- a/intern/vamr/intern/VAMR_capi.cc
+++ b/intern/vamr/intern/CAPI.cc
@@ -18,10 +18,11 @@
* \ingroup VAMR
*/
-#include "VAMR_Exception.h"
-#include "VAMR_IContext.h"
#include "VAMR_Types.h"
#include "VAMR_capi.h"
+#include "VAMR_IContext.h"
+
+#include "Exception.h"
#define VAMR_CAPI_CALL(call, ctx) \
try { \
diff --git a/intern/vamr/intern/VAMR_Context.cc b/intern/vamr/intern/Context.cc
similarity index 99%
rename from intern/vamr/intern/VAMR_Context.cc
rename to intern/vamr/intern/Context.cc
index 87b90bb5635..5ed44880d64 100644
--- a/intern/vamr/intern/VAMR_Context.cc
+++ b/intern/vamr/intern/Context.cc
@@ -25,11 +25,13 @@
#include <string>
#include "VAMR_Types.h"
-#include "VAMR_intern.h"
-#include "VAMR_Exception.h"
-#include "VAMR_Session.h"
-#include "VAMR_Context.h"
+#include "openxr_includes.h"
+
+#include "Context.h"
+#include "Exception.h"
+#include "Session.h"
+#include "utils.h"
namespace VAMR {
diff --git a/intern/vamr/intern/VAMR_Context.h b/intern/vamr/intern/Context.h
similarity index 98%
rename from intern/vamr/intern/VAMR_Context.h
rename to intern/vamr/intern/Context.h
index f0b6d7ddcb8..fcdd6a41b0e 100644
--- a/intern/vamr/intern/VAMR_Context.h
+++ b/intern/vamr/intern/Context.h
@@ -18,8 +18,8 @@
* \ingroup VAMR
*/
-#ifndef __VAMR_CONTEXT_H__
-#define __VAMR_CONTEXT_H__
+#ifndef __CONTEXT_H__
+#define __CONTEXT_H__
#include <memory>
#include <vector>
@@ -127,4 +127,4 @@ class Context : public VAMR::IContext {
} // namespace VAMR
-#endif // __VAMR_CONTEXT_H__
+#endif // __CONTEXT_H__
diff --git a/intern/vamr/intern/VAMR_Event.cc b/intern/vamr/intern/Event.cc
similarity index 96%
rename from intern/vamr/intern/VAMR_Event.cc
rename to intern/vamr/intern/Event.cc
index b2656c29de2..102f897adc0 100644
--- a/intern/vamr/intern/VAMR_Event.cc
+++ b/intern/vamr/intern/Event.cc
@@ -21,9 +21,12 @@
#include <iostream>
#include "VAMR_Types.h"
-#include "VAMR_intern.h"
#include "VAMR_capi.h"
-#include "VAMR_Context.h"
+
+#include "openxr_includes.h"
+
+#include "Context.h"
+#include "utils.h"
namespace VAMR {
diff --git a/intern/vamr/intern/VAMR_Exception.h b/intern/vamr/intern/Exception.h
similarity index 93%
rename from intern/vamr/intern/VAMR_Exception.h
rename to intern/vamr/intern/Exception.h
index f4f831f4c08..060e8f3a458 100644
--- a/intern/vamr/intern/VAMR_Exception.h
+++ b/intern/vamr/intern/Exception.h
@@ -18,8 +18,8 @@
* \ingroup VAMR
*/
-#ifndef __VAMR_EXCEPTION_H__
-#define __VAMR_EXCEPTION_H__
+#ifndef __EXCEPTION_H__
+#define __EXCEPTION_H__
#include <exception>
@@ -52,4 +52,4 @@ class Exception : public std::exception {
} // namespace VAMR
-#endif // __VAMR_EXCEPTION_H__
+#endif // __EXCEPTION_H__
diff --git a/intern/vamr/intern/VAMR_GraphicsBinding.cc b/intern/vamr/intern/GraphicsBinding.cc
similarity index 99%
rename from intern/vamr/intern/VAMR_GraphicsBinding.cc
rename to intern/vamr/intern/GraphicsBinding.cc
index c036421d517..f9b4216b3e3 100644
--- a/intern/vamr/intern/VAMR_GraphicsBinding.cc
+++ b/intern/vamr/intern/GraphicsBinding.cc
@@ -31,9 +31,9 @@
# endif
#endif
#include "VAMR_capi.h"
-#include "VAMR_intern.h"
-#include "VAMR_IGraphicsBinding.h"
+#include "IGraphicsBinding.h"
+#include "utils.h"
namespace VAMR {
diff --git a/intern/vamr/intern/VAMR_IGraphicsBinding.h b/intern/vamr/intern/IGraphicsBinding.h
similarity index 94%
rename from intern/vamr/intern/VAMR_IGraphicsBinding.h
rename to intern/vamr/intern/IGraphicsBinding.h
index ae03d3f86d2..00134f8e5cd 100644
--- a/intern/vamr/intern/VAMR_IGraphicsBinding.h
+++ b/intern/vamr/intern/IGraphicsBinding.h
@@ -18,14 +18,14 @@
* \ingroup VAMR
*/
-#ifndef __VAMR_IGRAPHICSBINDING_H__
-#define __VAMR_IGRAPHICSBINDING_H__
+#ifndef __IGRAPHICSBINDING_H__
+#define __IGRAPHICSBINDING_H__
#include <memory>
#include <string>
#include <vector>
-#include "VAMR_openxr_includes.h"
+#include "openxr_includes.h"
namespace VAMR {
@@ -71,4 +71,4 @@ std::unique_ptr<IGraphicsBinding> GraphicsBindingCreateFromType(VAMR_GraphicsBin
} // namespace VAMR
-#endif /* __VAMR_IGRAPHICSBINDING_H__ */
+#endif /* __IGRAPHICSBINDING_H__ */
diff --git a/intern/vamr/intern/VAMR_Session.cc b/intern/vamr/intern/Session.cc
similarity index 99%
rename from intern/vamr/intern/VAMR_Session.cc
rename to intern/vamr/intern/Session.cc
index 315bf0f3f7b..af64a01dc61 100644
--- a/intern/vamr/intern/VAMR_Session.cc
+++ b/intern/vamr/intern/Session.cc
@@ -27,12 +27,13 @@
#include "VAMR_capi.h"
-#include "VAMR_IGraphicsBinding.h"
-#include "VAMR_intern.h"
-#include "VAMR_Context.h"
-#include "VAMR_Exception.h"
+#include "openxr_includes.h"
-#include "VAMR_Session.h"
+#include "Context.h"
+#include "Exception.h"
+#include "IGraphicsBinding.h"
+#include "Session.h"
+#include "utils.h"
namespace VAMR {
diff --git a/intern/vamr/intern/VAMR_Session.h b/intern/vamr/intern/Session.h
similarity index 96%
rename from intern/vamr/intern/VAMR_Session.h
rename to intern/vamr/intern/Session.h
index ab324dc2abb..1ba1a1d658a 100644
--- a/intern/vamr/intern/VAMR_Session.h
+++ b/intern/vamr/intern/Session.h
@@ -18,8 +18,8 @@
* \ingroup VAMR
*/
-#ifndef __VAMR_SESSION_H__
-#define __VAMR_SESSION_H__
+#ifndef __SESSION_H__
+#define __SESSION_H__
#include <map>
#include <memory>
@@ -79,4 +79,4 @@ class Session {
} // namespace VAMR
-#endif /* __VAMR_SESSION_H__ */
+#endif /* __SESSION_H__ */
diff --git a/intern/vamr/intern/VAMR.cc b/intern/vamr/intern/VAMR.cc
index f65055df958..6e3268ddb4f 100644
--- a/intern/vamr/intern/VAMR.cc
+++ b/intern/vamr/intern/VAMR.cc
@@ -25,9 +25,11 @@
#include "VAMR_capi.h"
-#include "VAMR_intern.h"
-#include "VAMR_Context.h"
-#include "VAMR_Exception.h"
+#include "openxr_includes.h"
+
+#include "Context.h"
+#include "Exception.h"
+#include "utils.h"
using namespace VAMR;
diff --git a/intern/vamr/intern/VAMR_openxr_includes.h b/intern/vamr/intern/openxr_includes.h
similarity index 100%
rename from intern/vamr/intern/VAMR_openxr_includes.h
rename to intern/vamr/intern/openxr_includes.h
diff --git a/intern/vamr/intern/VAMR_intern.h b/intern/vamr/intern/utils.h
similarity index 96%
rename from intern/vamr/intern/VAMR_intern.h
rename to intern/vamr/intern/utils.h
index a7c78035229..88fbeda96e5 100644
--- a/intern/vamr/intern/VAMR_intern.h
+++ b/intern/vamr/intern/utils.h
@@ -18,14 +18,12 @@
* \ingroup VAMR
*/
-#ifndef __VAMR_INTERN_H__
-#define __VAMR_INTERN_H__
+#ifndef __UTILS_H__
+#define __UTILS_H__
#include <memory>
#include <vector>
-#include "VAMR_openxr_includes.h"
-
namespace VAMR {
#define CHECK_XR(call, error_msg) \
@@ -135,4 +133,4 @@ template<typename _OXR_HANDLE> class unique_oxr_ptr {
} // namespace VAMR
-#endif /* __VAMR_INTERN_H__ */
+#endif /* __UTILS_H__ */
More information about the Bf-blender-cvs
mailing list