Fixed no Vulakn and no OpenGL modes on Linux

TheMostDiligent · TheMostDiligent · commit 4082613ad496 · 2019-12-30T11:03:07.000-08:00
diff --git a/SampleBase/src/Linux/SampleAppLinux.cpp b/SampleBase/src/Linux/SampleAppLinux.cpp
@@ -22,7 +22,9 @@
 */
 
 #include "SampleApp.h"
-#include "ImGuiImplLinuxXCB.h"
+#if VULKAN_SUPPORTED
+#    include "ImGuiImplLinuxXCB.h"
+#endif
 #include "ImGuiImplLinuxX11.h"
 
 namespace Diligent
diff --git a/Tutorials/Tutorial00_HelloLinux/CMakeLists.txt b/Tutorials/Tutorial00_HelloLinux/CMakeLists.txt
@@ -18,7 +18,9 @@ set_target_properties(Tutorial00_HelloLinux PROPERTIES
     CXX_EXTENSIONS OFF
 )
 
-target_link_libraries(Tutorial00_HelloLinux PRIVATE GL X11 Diligent-GraphicsEngineOpenGL-shared)
+if(OPENGL_SUPPORTED)
+    target_link_libraries(Tutorial00_HelloLinux PRIVATE Diligent-GraphicsEngineOpenGL-shared GL X11)
+endif()
 
 if(VULKAN_SUPPORTED)
     target_link_libraries(Tutorial00_HelloLinux PRIVATE Diligent-GraphicsEngineVk-shared xcb)
diff --git a/Tutorials/Tutorial00_HelloLinux/src/Tutorial00_HelloLinux.cpp b/Tutorials/Tutorial00_HelloLinux/src/Tutorial00_HelloLinux.cpp
@@ -86,7 +86,9 @@ struct xcb_size_hints_t
 #    define GL_SUPPORTED 1
 #endif
 
-#include "Graphics/GraphicsEngineOpenGL/interface/EngineFactoryOpenGL.h"
+#if OPENGL_SUPPORTED
+#    include "Graphics/GraphicsEngineOpenGL/interface/EngineFactoryOpenGL.h"
+#endif
 
 #if VULKAN_SUPPORTED
 #    include "Graphics/GraphicsEngineVulkan/interface/EngineFactoryVk.h"
@@ -189,6 +191,7 @@ class Tutorial00App
         m_pImmediateContext->Flush();
     }
 
+#if OPENGL_SUPPORTED
     bool OnGLContextCreated(Display* display, Window NativeWindowHandle)
     {
         SwapChainDesc SCDesc;
@@ -204,6 +207,7 @@ class Tutorial00App
 
         return true;
     }
+#endif
 
 #if VULKAN_SUPPORTED
     bool InitVulkan(XCBInfo& xcbInfo)
@@ -479,6 +483,7 @@ int xcb_main()
 
 #endif
 
+#if OPENGL_SUPPORTED
 int x_main()
 {
     std::unique_ptr<Tutorial00App> TheApp(new Tutorial00App);
@@ -640,13 +645,20 @@ int x_main()
 
     return 0;
 }
+#endif
 
 int main(int argc, char** argv)
 {
-    DeviceType DevType = DeviceType::OpenGL;
+    DeviceType DevType = DeviceType::Undefined;
 
-#ifdef VULKAN_SUPPORTED
+#if VULKAN_SUPPORTED
     DevType = DeviceType::Vulkan;
+#elif OPENGL_SUPPORTED
+    DevType = DeviceType::OpenGL;
+#else
+#    error No supported backends
+#endif
+
     if (argc > 1)
     {
         const auto* Key = "-mode ";
@@ -656,11 +668,21 @@ int main(int argc, char** argv)
             pos += strlen(Key);
             if (strcasecmp(pos, "GL") == 0)
             {
+#if OPENGL_SUPPORTED
                 DevType = DeviceType::OpenGL;
+#else
+                std::cerr << "OpenGL is not supported";
+                return -1;
+#endif
             }
             else if (strcasecmp(pos, "VK") == 0)
             {
+#if VULKAN_SUPPORTED
                 DevType = DeviceType::Vulkan;
+#else
+                std::cerr << "Vulkan is not supported";
+                return -1;
+#endif
             }
             else
             {
@@ -670,11 +692,19 @@ int main(int argc, char** argv)
         }
     }
 
+#if VULKAN_SUPPORTED
     if (DevType == DeviceType::Vulkan)
     {
         return xcb_main();
     }
 #endif
 
-    return x_main();
+#if OPENGL_SUPPORTED
+    if (DevType == DeviceType::OpenGL)
+    {
+        return x_main();
+    }
+#endif
+
+    return -1;
 }

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,9 @@ set_target_properties(Tutorial00_HelloLinux PROPERTIES`
`18`	`18`	`CXX_EXTENSIONS OFF`
`19`	`19`	`)`
`20`	`20`
`21`		`-target_link_libraries(Tutorial00_HelloLinux PRIVATE GL X11 Diligent-GraphicsEngineOpenGL-shared)`
	`21`	`+if(OPENGL_SUPPORTED)`
	`22`	`+ target_link_libraries(Tutorial00_HelloLinux PRIVATE Diligent-GraphicsEngineOpenGL-shared GL X11)`
	`23`	`+endif()`
`22`	`24`
`23`	`25`	`if(VULKAN_SUPPORTED)`
`24`	`26`	`target_link_libraries(Tutorial00_HelloLinux PRIVATE Diligent-GraphicsEngineVk-shared xcb)`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,9 @@ struct xcb_size_hints_t`
`86`	`86`	`# define GL_SUPPORTED 1`
`87`	`87`	`#endif`
`88`	`88`
`89`		`-#include "Graphics/GraphicsEngineOpenGL/interface/EngineFactoryOpenGL.h"`
	`89`	`+#if OPENGL_SUPPORTED`
	`90`	`+# include "Graphics/GraphicsEngineOpenGL/interface/EngineFactoryOpenGL.h"`
	`91`	`+#endif`
`90`	`92`
`91`	`93`	`#if VULKAN_SUPPORTED`
`92`	`94`	`# include "Graphics/GraphicsEngineVulkan/interface/EngineFactoryVk.h"`
`@@ -189,6 +191,7 @@ class Tutorial00App`
`189`	`191`	`m_pImmediateContext->Flush();`
`190`	`192`	`}`
`191`	`193`
	`194`	`+#if OPENGL_SUPPORTED`
`192`	`195`	`bool OnGLContextCreated(Display* display, Window NativeWindowHandle)`
`193`	`196`	`{`
`194`	`197`	`SwapChainDesc SCDesc;`
`@@ -204,6 +207,7 @@ class Tutorial00App`
`204`	`207`
`205`	`208`	`return true;`
`206`	`209`	`}`
	`210`	`+#endif`
`207`	`211`
`208`	`212`	`#if VULKAN_SUPPORTED`
`209`	`213`	`bool InitVulkan(XCBInfo& xcbInfo)`
`@@ -479,6 +483,7 @@ int xcb_main()`
`479`	`483`
`480`	`484`	`#endif`
`481`	`485`
	`486`	`+#if OPENGL_SUPPORTED`
`482`	`487`	`int x_main()`
`483`	`488`	`{`
`484`	`489`	`std::unique_ptr<Tutorial00App> TheApp(new Tutorial00App);`
`@@ -640,13 +645,20 @@ int x_main()`
`640`	`645`
`641`	`646`	`return 0;`
`642`	`647`	`}`
	`648`	`+#endif`
`643`	`649`
`644`	`650`	`int main(int argc, char** argv)`
`645`	`651`	`{`
`646`		`- DeviceType DevType = DeviceType::OpenGL;`
	`652`	`+ DeviceType DevType = DeviceType::Undefined;`
`647`	`653`
`648`		`-#ifdef VULKAN_SUPPORTED`
	`654`	`+#if VULKAN_SUPPORTED`
`649`	`655`	`DevType = DeviceType::Vulkan;`
	`656`	`+#elif OPENGL_SUPPORTED`
	`657`	`+ DevType = DeviceType::OpenGL;`
	`658`	`+#else`
	`659`	`+# error No supported backends`
	`660`	`+#endif`
	`661`	`+`
`650`	`662`	`if (argc > 1)`
`651`	`663`	`{`
`652`	`664`	`const auto* Key = "-mode ";`
`@@ -656,11 +668,21 @@ int main(int argc, char** argv)`
`656`	`668`	`pos += strlen(Key);`
`657`	`669`	`if (strcasecmp(pos, "GL") == 0)`
`658`	`670`	`{`
	`671`	`+#if OPENGL_SUPPORTED`
`659`	`672`	`DevType = DeviceType::OpenGL;`
	`673`	`+#else`
	`674`	`+ std::cerr << "OpenGL is not supported";`
	`675`	`+ return -1;`
	`676`	`+#endif`
`660`	`677`	`}`
`661`	`678`	`else if (strcasecmp(pos, "VK") == 0)`
`662`	`679`	`{`
	`680`	`+#if VULKAN_SUPPORTED`
`663`	`681`	`DevType = DeviceType::Vulkan;`
	`682`	`+#else`
	`683`	`+ std::cerr << "Vulkan is not supported";`
	`684`	`+ return -1;`
	`685`	`+#endif`
`664`	`686`	`}`
`665`	`687`	`else`
`666`	`688`	`{`
`@@ -670,11 +692,19 @@ int main(int argc, char** argv)`
`670`	`692`	`}`
`671`	`693`	`}`
`672`	`694`
	`695`	`+#if VULKAN_SUPPORTED`
`673`	`696`	`if (DevType == DeviceType::Vulkan)`
`674`	`697`	`{`
`675`	`698`	`return xcb_main();`
`676`	`699`	`}`
`677`	`700`	`#endif`
`678`	`701`
`679`		`- return x_main();`
	`702`	`+#if OPENGL_SUPPORTED`
	`703`	`+ if (DevType == DeviceType::OpenGL)`
	`704`	`+ {`
	`705`	`+ return x_main();`
	`706`	`+ }`
	`707`	`+#endif`
	`708`	`+`
	`709`	`+ return -1;`
`680`	`710`	`}`