0001-build-fixes.patch 5.3 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136
  1. diff --git a/thirdparty/amd-fsr2/ffx_fsr2.cpp b/thirdparty/amd-fsr2/ffx_fsr2.cpp
  2. index 051018e437..3970aa7f5b 100644
  3. --- a/thirdparty/amd-fsr2/ffx_fsr2.cpp
  4. +++ b/thirdparty/amd-fsr2/ffx_fsr2.cpp
  5. @@ -36,6 +36,15 @@
  6. #pragma clang diagnostic ignored "-Wunused-variable"
  7. #endif
  8. +#ifndef _countof
  9. +#define _countof(array) (sizeof(array) / sizeof(array[0]))
  10. +#endif
  11. +
  12. +#ifndef _MSC_VER
  13. +#include <wchar.h>
  14. +#define wcscpy_s wcscpy
  15. +#endif
  16. +
  17. // max queued frames for descriptor management
  18. static const uint32_t FSR2_MAX_QUEUED_FRAMES = 16;
  19. diff --git a/thirdparty/amd-fsr2/ffx_types.h b/thirdparty/amd-fsr2/ffx_types.h
  20. index 74edd192c4..f71b259cce 100644
  21. --- a/thirdparty/amd-fsr2/ffx_types.h
  22. +++ b/thirdparty/amd-fsr2/ffx_types.h
  23. @@ -22,6 +22,7 @@
  24. #pragma once
  25. #include <stdint.h>
  26. +#include <stdlib.h>
  27. #if defined (FFX_GCC)
  28. /// FidelityFX exported functions
  29. diff --git a/thirdparty/amd-fsr2/shaders/ffx_fsr2_accumulate_pass.glsl b/thirdparty/amd-fsr2/shaders/ffx_fsr2_accumulate_pass.glsl
  30. index ebbe610ffa..31d68292d4 100644
  31. --- a/thirdparty/amd-fsr2/shaders/ffx_fsr2_accumulate_pass.glsl
  32. +++ b/thirdparty/amd-fsr2/shaders/ffx_fsr2_accumulate_pass.glsl
  33. @@ -19,7 +19,7 @@
  34. // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  35. // THE SOFTWARE.
  36. -#version 450
  37. +//#version 450
  38. #extension GL_GOOGLE_include_directive : require
  39. #extension GL_EXT_samplerless_texture_functions : require
  40. diff --git a/thirdparty/amd-fsr2/shaders/ffx_fsr2_autogen_reactive_pass.glsl b/thirdparty/amd-fsr2/shaders/ffx_fsr2_autogen_reactive_pass.glsl
  41. index 7ae41cf0c1..3b86c17d4d 100644
  42. --- a/thirdparty/amd-fsr2/shaders/ffx_fsr2_autogen_reactive_pass.glsl
  43. +++ b/thirdparty/amd-fsr2/shaders/ffx_fsr2_autogen_reactive_pass.glsl
  44. @@ -19,7 +19,7 @@
  45. // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  46. // THE SOFTWARE.
  47. -#version 450
  48. +//#version 450
  49. #extension GL_GOOGLE_include_directive : require
  50. #extension GL_EXT_samplerless_texture_functions : require
  51. diff --git a/thirdparty/amd-fsr2/shaders/ffx_fsr2_compute_luminance_pyramid_pass.glsl b/thirdparty/amd-fsr2/shaders/ffx_fsr2_compute_luminance_pyramid_pass.glsl
  52. index 15186e3bb6..8439c4e9d4 100644
  53. --- a/thirdparty/amd-fsr2/shaders/ffx_fsr2_compute_luminance_pyramid_pass.glsl
  54. +++ b/thirdparty/amd-fsr2/shaders/ffx_fsr2_compute_luminance_pyramid_pass.glsl
  55. @@ -19,7 +19,7 @@
  56. // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  57. // THE SOFTWARE.
  58. -#version 450
  59. +//#version 450
  60. #extension GL_GOOGLE_include_directive : require
  61. #extension GL_EXT_samplerless_texture_functions : require
  62. diff --git a/thirdparty/amd-fsr2/shaders/ffx_fsr2_depth_clip_pass.glsl b/thirdparty/amd-fsr2/shaders/ffx_fsr2_depth_clip_pass.glsl
  63. index fcb2b76528..45ec5bdb86 100644
  64. --- a/thirdparty/amd-fsr2/shaders/ffx_fsr2_depth_clip_pass.glsl
  65. +++ b/thirdparty/amd-fsr2/shaders/ffx_fsr2_depth_clip_pass.glsl
  66. @@ -19,7 +19,7 @@
  67. // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  68. // THE SOFTWARE.
  69. -#version 450
  70. +//#version 450
  71. #extension GL_GOOGLE_include_directive : require
  72. #extension GL_EXT_samplerless_texture_functions : require
  73. diff --git a/thirdparty/amd-fsr2/shaders/ffx_fsr2_lock_pass.glsl b/thirdparty/amd-fsr2/shaders/ffx_fsr2_lock_pass.glsl
  74. index f7cad59c20..7c3a4c2740 100644
  75. --- a/thirdparty/amd-fsr2/shaders/ffx_fsr2_lock_pass.glsl
  76. +++ b/thirdparty/amd-fsr2/shaders/ffx_fsr2_lock_pass.glsl
  77. @@ -19,7 +19,7 @@
  78. // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  79. // THE SOFTWARE.
  80. -#version 450
  81. +//#version 450
  82. #extension GL_GOOGLE_include_directive : require
  83. #extension GL_EXT_samplerless_texture_functions : require
  84. diff --git a/thirdparty/amd-fsr2/shaders/ffx_fsr2_rcas_pass.glsl b/thirdparty/amd-fsr2/shaders/ffx_fsr2_rcas_pass.glsl
  85. index f0823c2bc8..8b4ebc6afc 100644
  86. --- a/thirdparty/amd-fsr2/shaders/ffx_fsr2_rcas_pass.glsl
  87. +++ b/thirdparty/amd-fsr2/shaders/ffx_fsr2_rcas_pass.glsl
  88. @@ -19,7 +19,7 @@
  89. // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  90. // THE SOFTWARE.
  91. -#version 450
  92. +//#version 450
  93. #extension GL_GOOGLE_include_directive : require
  94. #extension GL_EXT_samplerless_texture_functions : require
  95. diff --git a/thirdparty/amd-fsr2/shaders/ffx_fsr2_reconstruct_previous_depth_pass.glsl b/thirdparty/amd-fsr2/shaders/ffx_fsr2_reconstruct_previous_depth_pass.glsl
  96. index 20e17eef8c..be4395aaed 100644
  97. --- a/thirdparty/amd-fsr2/shaders/ffx_fsr2_reconstruct_previous_depth_pass.glsl
  98. +++ b/thirdparty/amd-fsr2/shaders/ffx_fsr2_reconstruct_previous_depth_pass.glsl
  99. @@ -19,7 +19,7 @@
  100. // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  101. // THE SOFTWARE.
  102. -#version 450
  103. +//#version 450
  104. #extension GL_GOOGLE_include_directive : require
  105. #extension GL_EXT_samplerless_texture_functions : require
  106. diff --git a/thirdparty/amd-fsr2/shaders/ffx_fsr2_tcr_autogen_pass.glsl b/thirdparty/amd-fsr2/shaders/ffx_fsr2_tcr_autogen_pass.glsl
  107. index bebca91099..7d6a66b8ac 100644
  108. --- a/thirdparty/amd-fsr2/shaders/ffx_fsr2_tcr_autogen_pass.glsl
  109. +++ b/thirdparty/amd-fsr2/shaders/ffx_fsr2_tcr_autogen_pass.glsl
  110. @@ -19,7 +19,7 @@
  111. // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  112. // THE SOFTWARE.
  113. -#version 450
  114. +//#version 450
  115. #extension GL_GOOGLE_include_directive : require
  116. #extension GL_EXT_samplerless_texture_functions : require