summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorassiduous <assiduous@diligentgraphics.com>2020-06-09 05:24:30 +0000
committerassiduous <assiduous@diligentgraphics.com>2020-06-09 05:24:30 +0000
commit7ff004c593e48a95c3fa0bf0e89927ed3ceef88d (patch)
tree81c22a6597499a5381500af4c7ba5ebb6fe575e5
parentEnabled HLSL2GLSLConverterApp on Linux (https://github.com/DiligentGraphics/D... (diff)
downloadDiligentTools-7ff004c593e48a95c3fa0bf0e89927ed3ceef88d.tar.gz
DiligentTools-7ff004c593e48a95c3fa0bf0e89927ed3ceef88d.zip
Enabled HLSL2GLSLConverterApp on MacOS
-rw-r--r--CMakeLists.txt2
-rw-r--r--HLSL2GLSLConverter/CMakeLists.txt3
-rw-r--r--HLSL2GLSLConverter/src/HLSL2GLSLConverterAppMacOS.cpp63
3 files changed, 67 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index aed3279..e53d664 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -39,7 +39,7 @@ add_subdirectory(AssetLoader)
add_subdirectory(Imgui)
add_subdirectory(NativeApp)
-if((PLATFORM_WIN32 OR PLATFORM_LINUX) AND GL_SUPPORTED)
+if((PLATFORM_WIN32 OR PLATFORM_LINUX OR PLATFORM_MACOS) AND GL_SUPPORTED)
add_subdirectory(HLSL2GLSLConverter)
endif()
diff --git a/HLSL2GLSLConverter/CMakeLists.txt b/HLSL2GLSLConverter/CMakeLists.txt
index f4997ac..0b1de80 100644
--- a/HLSL2GLSLConverter/CMakeLists.txt
+++ b/HLSL2GLSLConverter/CMakeLists.txt
@@ -16,6 +16,9 @@ if(PLATFORM_WIN32)
elseif(PLATFORM_LINUX)
list(APPEND SOURCE src/HLSL2GLSLConverterAppLinux.cpp)
add_executable(HLSL2GLSLConverter ${SOURCE})
+elseif(PLATFORM_MACOS)
+ list(APPEND SOURCE src/HLSL2GLSLConverterAppMacOS.cpp)
+ add_executable(HLSL2GLSLConverter ${SOURCE})
else()
message(FATAL_ERROR "Unsupported platform")
endif()
diff --git a/HLSL2GLSLConverter/src/HLSL2GLSLConverterAppMacOS.cpp b/HLSL2GLSLConverter/src/HLSL2GLSLConverterAppMacOS.cpp
new file mode 100644
index 0000000..dfd5036
--- /dev/null
+++ b/HLSL2GLSLConverter/src/HLSL2GLSLConverterAppMacOS.cpp
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2019-2020 Diligent Graphics LLC
+ * Copyright 2015-2019 Egor Yusov
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * In no event and under no legal theory, whether in tort (including negligence),
+ * contract, or otherwise, unless required by applicable law (such as deliberate
+ * and grossly negligent acts) or agreed to in writing, shall any Contributor be
+ * liable for any damages, including any direct, indirect, special, incidental,
+ * or consequential damages of any character arising as a result of this License or
+ * out of the use or inability to use the software (including but not limited to damages
+ * for loss of goodwill, work stoppage, computer failure or malfunction, or any and
+ * all other commercial damages or losses), even if such Contributor has been advised
+ * of the possibility of such damages.
+ */
+
+#include "HLSL2GLSLConverterApp.h"
+#include "Errors.hpp"
+#include "RenderDevice.h"
+#include "EngineFactoryOpenGL.h"
+#include "RefCntAutoPtr.hpp"
+
+using namespace Diligent;
+
+int main(int argc, char** argv)
+{
+ HLSL2GLSLConverterApp Converter;
+
+ if (argc == 1)
+ {
+ Converter.PrintHelp();
+ return 0;
+ }
+
+ {
+ auto ret = Converter.ParseCmdLine(argc, argv);
+ if (ret != 0)
+ return ret;
+ }
+
+ RefCntAutoPtr<IRenderDevice> pDevice;
+ //RefCntAutoPtr<IDeviceContext> pContext;
+ //RefCntAutoPtr<ISwapChain> pSwapChain;
+
+ if (Converter.NeedsCompileShader())
+ {
+ // TODO: initialize OpenGL
+ }
+
+ auto ret = Converter.Convert(pDevice);
+ return ret;
+}