Merge branch 'master' of https://github.com/hjelmw/FidelityFX-FSR2

src/ffx-fsr2-api/ffx_assert.cpp

@@ -19,8 +19,8 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#include "ffx_assert.h"
 #include <stdlib.h>  // for malloc()
+#include "ffx_assert.h"
 
 #ifdef _WIN32
 #ifndef WIN32_LEAN_AND_MEAN

src/ffx-fsr2-api/ffx_fsr2.cpp

@@ -32,6 +32,14 @@
 
 #include "ffx_fsr2_maximum_bias.h"
 
+#ifndef _MSC_VER
+template < typename T, size_t N >
+size_t _countof(T(&arr)[N])
+{
+    return std::extent< T[N] >::value;
+}
+#endif
+
 #ifdef __clang__
 #pragma clang diagnostic ignored "-Wunused-variable"
 #endif