Add vulkansupport.

Author: Sibras

README.md

@@ -69,20 +69,26 @@ However the following is a list of extra dependency options that require externa
 	1. Download either the "Intel OpenCL SDK", "AMD OpenCL SDK" or the "NVIDIA CUDA SDK" from their respective suppliers.
 	2. Install the downloaded SDK wherever desired.
 3. ffnvcodec/nvdec/nvenc (requires nv-codec-headers)
-    1. Download the nv-codec-headers repository from https://github.com/FFmpeg/nv-codec-headers
-    2. Save the contents of the nv-codec-headers repositories "include" folder into "OutputDir/include/*".
+	1. Download the nv-codec-headers repository from https://github.com/FFmpeg/nv-codec-headers
+	2. Save the contents of the nv-codec-headers repositories "include" folder into "OutputDir/include/*".
 5. cuda-sdk (requires latest NVIDIA CUDA SDK)
-    1. Download the NVIDIA CUDA SDK from the NVIDIA website
-    2. Install the downloaded SDK wherever desired.
+	1. Download the NVIDIA CUDA SDK from the NVIDIA website
+	2. Install the downloaded SDK wherever desired.
 6. amf (requires Advanced Media Framework (AMF) SDK headers)
-    1. Download the AMF repository from https://github.com/GPUOpen-LibrariesAndSDKs/AMF
-    2. Save the contents of the AMF repositories "amf/public/include" into "OutputDir/include/AMF/*".
+	1. Download the AMF repository from https://github.com/GPUOpen-LibrariesAndSDKs/AMF
+	2. Save the contents of the AMF repositories "amf/public/include" into "OutputDir/include/AMF/*".
 7. decklink (requires Blackmagic DeckLink SDK)
 	1. Download the "Blackmagic DeckLink SDK" from the Blackmagic website.
 	2. Extract the downloaded SDK wherever desired.
-    3. Run the following command from a Visual Studio developer command prompt in the "Win/include" folder:
-    midl /win32 /h DeckLinkAPI.h DeckLinkAPI.idl
-    4. Copy the newly created "DeckLinkAPI.h" and "DeckLinkAPI_i.c" files to *OutputDir*/include/*.
+	3. Run the following command from a Visual Studio developer command prompt in the "Win/include" folder:
+	midl /win32 /h DeckLinkAPI.h DeckLinkAPI.idl
+	4. Copy the newly created "DeckLinkAPI.h" and "DeckLinkAPI_i.c" files to *OutputDir*/include/*.
+8. vulkan (requires Vulkan headers or Vulkan SDK)
+	1. Download the Vulkan SDK from https://www.lunarg.com/vulkan-sdk/
+	2. Install the downloaded SDK wherever desired.
+	or
+	1. Download the vulkan-headers repository from https://github.com/KhronosGroup/Vulkan-Headers
+	2. Save the contents of the vulkan-headers repositories "include" folder into "OutputDir/include/*".
 
 Any dependencies supplied by ShiftMediaProject should be downloaded next to the FFmpeg folder as they will use the same OutputDir location. Projects to build each dependency can be found in the respective repository **./SMP** directories.
 

source/configGenerator_build.cpp

@@ -329,7 +329,8 @@ bool ConfigGenerator::buildAutoDetectValues()
                 } else if (i == "crystalhd") {
                     enable = false;
                 } else if (i == "cuda" || i == "cuvid") {
-                    enable = findFile(m_rootDirectory + "compat/cuda/dynlink_cuda.h", sFileName);
+                    enable = (findFile(m_rootDirectory + "compat/cuda/dynlink_loader.h", sFileName) &&
+                        findFile(m_rootDirectory + "compat/cuda/dynlink_cuda.h", sFileName));
                     if (!enable) {
                         makeFileGeneratorRelative(m_outDirectory + "include/ffnvcodec/dynlink_cuda.h", sFileName);
                         enable = findFile(sFileName, sFileName);
@@ -414,6 +415,9 @@ bool ConfigGenerator::buildAutoDetectValues()
                 } else if (i == "videotoolbox_hwaccel") {
                     enable = false;
                 } else if (i == "vulkan") {
+                    enable = true;
+                } else if (i == "libglslang" || i == " libshaderc" ||
+                    i == " spirv_compiler") {
                     // Not currently supported
                     enable = false;
                 } else if (i == "w32threads") {
@@ -825,6 +829,14 @@ void ConfigGenerator::buildReplaceValues(
 #   define CONFIG_OPENAL 1\n\
 #else\n\
 #   define CONFIG_OPENAL 0\n\
+#endif";
+        }
+        opt = getConfigOptionPrefixed("CONFIG_VULKAN");
+        if ((opt != m_configValues.end()) && opt->m_value == "1") {
+            replaceValues["CONFIG_VULKAN"] = "#if " + winrtDefine + "\n\
+#   define CONFIG_VULKAN 1\n\
+#else\n\
+#   define CONFIG_VULKAN 0\n\
 #endif";
         }
     }

source/projectGenerator_build.cpp

@@ -205,6 +205,8 @@ void ProjectGenerator::buildDependencies(StaticList& libs, StaticList& addLibs,
                 }
             } else if (i == "wincrypt") {
                 addLibs.emplace_back("Advapi32"); // Add the additional required libs
+            } else if (i == "vulkan") {
+                // Doesn't need any additional libs
             } else {
                 // By default just use the lib name and prefix with lib if not already
                 if (i.find("lib") == 0) {
@@ -391,6 +393,24 @@ void ProjectGenerator::buildDependencyValues(StaticList& includeDirs, StaticList
                         lib64Dirs.emplace_back("$(CUDA_PATH)/lib/x64");
                     }
                 }
+            } else if (i.first == "vulkan" && !winrt) {
+                if (findEnvironmentVariable("VULKAN_SDK")) {
+                    includeDirs.emplace_back("$(VULKAN_SDK)/include/");
+                } else {
+                    string fileName;
+                    m_configHelper.makeFileGeneratorRelative(
+                        m_configHelper.m_outDirectory + "include/vulkan/vulkan.h", fileName);
+                    if (findFile(fileName, fileName)) {
+                        // Nothing to do as $(OutDir)/include is always added anyway
+                    } else {
+                        outputWarning("Could not find the Vulkan headers.");
+                        outputWarning(
+                            "Either the Vulkan SDK is not installed or the environment variable is missing or the headers are not installed in a known location.", false);
+                        outputWarning(
+                            "Vulkan requires the Vulkan headers to be available in the include path.",
+                            false);
+                    }
+                }
             }
         }
     }
@@ -526,7 +546,8 @@ void ProjectGenerator::buildProjectDependencies(map<string, bool>& projectDeps)
     projectDeps["sdl"] = (m_projectName == "libavdevice") || (m_projectName == "ffplay") || (m_projectName == "avplay");
     projectDeps["sdl2"] =
         (m_projectName == "libavdevice") || (m_projectName == "ffplay") || (m_projectName == "avplay");
-    projectDeps["vapoursynth"] = m_projectName.compare("libavformat");
+    projectDeps["vapoursynth"] = m_projectName == "libavformat";
+    projectDeps["vulkan"] = (m_projectName == "libavcodec") || (m_projectName == "libavutil");
     projectDeps["zlib"] = (m_projectName == "libavformat") || (m_projectName == "libavcodec");
 }