Merge gitlab.com:openmw/openmw into lua_class_data

components/CMakeLists.txt

@@ -26,6 +26,7 @@ if (GIT_CHECKOUT)
             -DOPENMW_VERSION_MINOR=${OPENMW_VERSION_MINOR}
             -DOPENMW_VERSION_RELEASE=${OPENMW_VERSION_RELEASE}
             -DOPENMW_LUA_API_REVISION=${OPENMW_LUA_API_REVISION}
+            -DOPENMW_POSTPROCESSING_API_REVISION=${OPENMW_POSTPROCESSING_API_REVISION}
             -DOPENMW_VERSION=${OPENMW_VERSION}
             -DMACROSFILE=${CMAKE_SOURCE_DIR}/cmake/OpenMWMacros.cmake
             "-DCMAKE_CONFIGURATION_TYPES=${CMAKE_CONFIGURATION_TYPES}"

components/fx/pass.cpp

@@ -15,6 +15,7 @@
 #include <components/sceneutil/lightmanager.hpp>
 #include <components/settings/values.hpp>
 #include <components/stereo/multiview.hpp>
+#include <components/version/version.hpp>
 
 #include "stateupdater.hpp"
 #include "technique.hpp"
@@ -67,6 +68,7 @@ namespace fx
 
 @uboStruct
 
+#define OMW_API_VERSION @apiVersion
 #define OMW_REVERSE_Z @reverseZ
 #define OMW_RADIAL_FOG @radialFog
 #define OMW_EXPONENTIAL_FOG @exponentialFog
@@ -259,6 +261,7 @@ float omw_EstimateFogCoverageFromUV(vec2 uv)
 
         const std::vector<std::pair<std::string, std::string>> defines
             = { { "@pointLightCount", std::to_string(SceneUtil::PPLightBuffer::sMaxPPLightsArraySize) },
+                  { "@apiVersion", std::to_string(Version::getPostprocessingApiRevision()) },
                   { "@version", std::to_string(technique.getGLSLVersion()) },
                   { "@multiview", Stereo::getMultiview() ? "1" : "0" },
                   { "@builtinSampler", Stereo::getMultiview() ? "sampler2DArray" : "sampler2D" },

components/version/version.cpp.in

@@ -25,6 +25,11 @@ namespace Version
         return @OPENMW_LUA_API_REVISION@;
     }
 
+    int getPostprocessingApiRevision()
+    {
+        return @OPENMW_POSTPROCESSING_API_REVISION@;
+    }
+
     std::string getOpenmwVersionDescription()
     {
         std::string str = "OpenMW version ";

components/version/version.hpp

@@ -11,6 +11,7 @@ namespace Version
     std::string_view getCommitHash();
     std::string_view getTagHash();
     int getLuaApiRevision();
+    int getPostprocessingApiRevision();
 
     // Prepares string that contains version and commit hash.
     std::string getOpenmwVersionDescription();