🚨 Fixed warning with dim3 by placing the export on public math and not on class

davidAlgis · davidAlgis · commit 960041e72c15 · 2023-04-04T11:34:31.000+02:00
diff --git a/Plugin/PluginInteropUnityCUDA/include/Buffer/vertex_buffer.h b/Plugin/PluginInteropUnityCUDA/include/Buffer/vertex_buffer.h
@@ -4,9 +4,7 @@
 #include "cuda_include.h"
 #include "log.h"
 
-UNITY_INTERFACE_EXPORT struct dim3;
-
-class UNITY_INTERFACE_EXPORT VertexBuffer
+class VertexBuffer
 {
 	public:
 
@@ -16,25 +14,25 @@ class UNITY_INTERFACE_EXPORT VertexBuffer
 		/// <param name="bufferHandle">A pointer of computeBuffer with float4 that has been generated with Unity (see function
 		/// GetNativeBufferPtr https://docs.unity3d.com/ScriptReference/ComputeBuffer.GetNativeBufferPtr.html) </param>
 		/// <param name="size">the size of the computeBuffer</param>
-		VertexBuffer(void* bufferHandle, int size);
+		UNITY_INTERFACE_EXPORT VertexBuffer(void* bufferHandle, int size);
 
 		/// <summary>
 		/// Register the buffer in CUDA, this has to be override because it depends on the graphics api
 		/// </summary>
-		virtual void registerBufferInCUDA() = 0;
+		UNITY_INTERFACE_EXPORT virtual void registerBufferInCUDA() = 0;
 
 		/// <summary>
 		/// Unregisteregister the buffer in CUDA, this has to be override because it depends on the graphics api
 		/// </summary>
-		virtual void unRegisterBufferInCUDA() = 0;
+		UNITY_INTERFACE_EXPORT virtual void unRegisterBufferInCUDA() = 0;
 
 
 		/// <summary>
 		/// Map resources to CUDA
 		/// </summary>
 		/// <returns>an array of float4* defined on device memory and which can be edited in cuda</returns>
 		template <typename T>
-		T* mapResources()
+		UNITY_INTERFACE_EXPORT T* mapResources()
 		{
 			// map resource
 			CUDA_CHECK(cudaGraphicsMapResources(1, &_pGraphicsResource, 0));
@@ -52,23 +50,23 @@ class UNITY_INTERFACE_EXPORT VertexBuffer
 		/// Unmap resources from CUDA
 		/// This function will wait for all previous GPU activity to complete
 		/// </summary>
-		void unmapResources();
+		UNITY_INTERFACE_EXPORT void unmapResources();
 
 		/// <summary>
 		/// Get the default dimension block (8,1,1)
 		/// </summary>
-		dim3 getDimBlock() const;
+		UNITY_INTERFACE_EXPORT dim3 getDimBlock() const;
 
 
 		/// <summary>
 		/// Get the default dimension grid ((sizeBuffer + 7)/8,1,1)
 		/// </summary>
-		dim3 getDimGrid() const;
+		UNITY_INTERFACE_EXPORT dim3 getDimGrid() const;
 
 		/// <summary>
 		/// Get the size of the buffer
 		/// </summary>
-		int getSize() const;
+		UNITY_INTERFACE_EXPORT int getSize() const;
 
 
 
diff --git a/Plugin/PluginInteropUnityCUDA/include/Texture/texture.h b/Plugin/PluginInteropUnityCUDA/include/Texture/texture.h
@@ -3,7 +3,7 @@
 #include "cuda_include.h"
 #include "log.h"
 
-class UNITY_INTERFACE_EXPORT Texture
+class Texture
 {
     public:
     /// <summary>
@@ -15,20 +15,21 @@ class UNITY_INTERFACE_EXPORT Texture
     /// </param> <param name="textureWidth">the width of the texture</param>
     /// <param name="textureHeight">the height of the texture</param>
     /// <param name="textureDepth">the depth of the texture</param>
-    Texture(void *textureHandle, int textureWidth, int textureHeight,
+    UNITY_INTERFACE_EXPORT Texture(void *textureHandle, int textureWidth,
+                                  int textureHeight,
             int textureDepth);
 
     /// <summary>
     /// Register the texture in CUDA, this has to be override because it depends
     /// on the graphics api
     /// </summary>
-    virtual void registerTextureInCUDA() = 0;
+    UNITY_INTERFACE_EXPORT virtual void registerTextureInCUDA() = 0;
 
     /// <summary>
     /// Unregister the texture in CUDA, this has to be override because it
     /// depends on the graphics api
     /// </summary>
-    virtual void unRegisterTextureInCUDA() = 0;
+    UNITY_INTERFACE_EXPORT virtual void unRegisterTextureInCUDA() = 0;
 
     /// <summary>
     /// Map a cuda array to the graphics resources and wrap it into a surface
@@ -38,7 +39,8 @@ class UNITY_INTERFACE_EXPORT Texture
     /// face index as defined by cudaGraphicsCubeFace for cubemap textures for
     /// the subresource to access </param> <returns>a cuda surface object on
     /// device memory and which can be edited in cuda</returns>
-    cudaSurfaceObject_t mapTextureToSurfaceObject(int indexInArray = 0);
+    UNITY_INTERFACE_EXPORT cudaSurfaceObject_t mapTextureToSurfaceObject(
+        int indexInArray = 0);
 
 
     /// <summary>
@@ -47,42 +49,45 @@ class UNITY_INTERFACE_EXPORT Texture
     /// </summary>
     /// <param name="inputSurfObj">the surface object that has been created with
     /// <c>mapTextureToSurfaceObject</c> function</param>
-    void unMapTextureToSurfaceObject(cudaSurfaceObject_t &inputSurfObj);
+    UNITY_INTERFACE_EXPORT void unMapTextureToSurfaceObject(
+        cudaSurfaceObject_t &inputSurfObj);
 
-    cudaTextureObject_t mapTextureToTextureObject(int indexInArray = 0);
+    UNITY_INTERFACE_EXPORT cudaTextureObject_t mapTextureToTextureObject(
+        int indexInArray = 0);
 
-    void unMapTextureToTextureObject(cudaTextureObject_t &texObj);
+    UNITY_INTERFACE_EXPORT void unMapTextureToTextureObject(
+        cudaTextureObject_t &texObj);
 
     /// <summary>
     /// Get the default dimension block (8,8,1)
     /// </summary>
-    dim3 getDimBlock() const;
+    UNITY_INTERFACE_EXPORT dim3 getDimBlock() const;
 
     /// <summary>
     /// Get the default dimension grid ((sizeBuffer + 7)/8,((sizeBuffer +
     /// 7)/8,1)
     /// </summary>
-    dim3 getDimGrid() const;
+    UNITY_INTERFACE_EXPORT dim3 getDimGrid() const;
 
     /// <summary>
     /// Get the width of the texture
     /// </summary>
-    int getWidth() const;
+    UNITY_INTERFACE_EXPORT int getWidth() const;
 
     /// <summary>
     /// Get the height of the texture
     /// </summary>
-    int getHeight() const;
+    UNITY_INTERFACE_EXPORT int getHeight() const;
 
     /// <summary>
     /// Get the depth of the texture
     /// </summary>
-    int getDepth() const;
+    UNITY_INTERFACE_EXPORT int getDepth() const;
 
     /// <summary>
     /// Get the native texture pointer
     /// </summary>
-    void *getNativeTexturePtr() const;
+    UNITY_INTERFACE_EXPORT void *getNativeTexturePtr() const;
 
     protected:
     // Pointer to the texture created in Unity
diff --git a/Plugin/Utilities/include/log.h b/Plugin/Utilities/include/log.h
@@ -25,7 +25,7 @@ extern "C"
     /// <param name="type">Type of log to get</param>
     void UTILITIES_API GetLastLog(const char*& data, logType type);
 
-    class UTILITIES_API Log
+    class Log
     {
     private:
 
@@ -42,36 +42,36 @@ extern "C"
 
     public:
         // SINGLETON
-        static Log& log();
+        UTILITIES_API static Log& log();
 
-        Log(const Log&) = delete;
-        Log& operator=(const Log&) = delete;
-        Log(Log&&) = delete;
-        Log& operator=(Log&&) = delete;
+        UTILITIES_API Log(const Log&) = delete;
+        UTILITIES_API Log& operator=(const Log&) = delete;
+        UTILITIES_API Log(Log&&) = delete;
+        UTILITIES_API Log& operator=(Log&&) = delete;
 
 
-        Log();
-        ~Log();
+        UTILITIES_API Log();
+        UTILITIES_API ~Log();
 
         /// <summary>
         /// This function is called when debulLog is called, it will write the string in parameters 
         /// and the fstream is the log file 
         /// </summary>
-        void setInfoPrintFunction(std::function<void(std::string, std::fstream&)> printFunc);
+        UTILITIES_API void setInfoPrintFunction(std::function<void(std::string, std::fstream&)> printFunc);
 
 
         /// <summary>
         /// This function is called when debulLogWarning is called, it will write the string in parameters 
         /// and the fstream is the log file 
         /// </summary>
-        void setWarningPrintFunction(std::function<void(std::string, std::fstream&)> printFunc);
+        UTILITIES_API void setWarningPrintFunction(std::function<void(std::string, std::fstream&)> printFunc);
 
 
         /// <summary>
         /// This function is called when debulLogError is called, it will write the string in parameters 
         /// and the fstream is the log file 
         /// </summary>
-        void setErrorPrintFunction(std::function<void(std::string, std::fstream&)> printFunc);
+        UTILITIES_API void setErrorPrintFunction(std::function<void(std::string, std::fstream&)> printFunc);
 
         /// <summary>
         /// It will merge all log and separate them by '\n' 
@@ -80,30 +80,30 @@ extern "C"
         /// merge of all log and separate them by '\n'. We use a reference to 
         /// a const char* to permit marshalling</param>
         /// <param name="type">Type of log to get</param>
-        void getMergedLog(const char*& data, logType type);
+        UTILITIES_API void getMergedLog(const char*& data, logType type);
 
         /// <summary>
         /// Call this function to write an info in log
         /// </summary>
         /// <param name="text">info to write in log</param>
-        void debugLog(const std::string text);
+        UTILITIES_API void debugLog(const std::string text);
 
         /// <summary>
         /// Call this function to write an warning in log
         /// This will add Warning : before message
         /// </summary>
         /// <param name="text">warning to write in log</param>
-        void debugLogWarning(const std::string text);
+        UTILITIES_API void debugLogWarning(const std::string text);
 
 
         /// <summary>
         /// Call this function to write an error in log
         /// This will add Error : before message
         /// </summary>
         /// <param name="text">error to write in log</param>
-        void debugLogError(const std::string text);
+        UTILITIES_API void debugLogError(const std::string text);
 
-        void extractLog(std::vector<std::string>& logVector);
+        UTILITIES_API void extractLog(std::vector<std::string>& logVector);
     };
 
 }
