Book a Demo!
CoCalc Logo Icon
StoreFeaturesDocsShareSupportNewsAboutPoliciesSign UpSign In
godotengine
GitHub Repository: godotengine/godot
 Path: blob/master/thirdparty/amd-fsr2/patches/0001-build-fixes.patch
9898 views
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
 

9
+#ifndef _countof

10
+#define _countof(array) (sizeof(array) / sizeof(array[0]))

11
+#endif

12
+

13
+#ifndef _MSC_VER

14
+#include <wchar.h>

15
+#define wcscpy_s wcscpy

16
+#endif

17
+

18
 // max queued frames for descriptor management

19
 static const uint32_t FSR2_MAX_QUEUED_FRAMES = 16;

20
 

21
diff --git a/thirdparty/amd-fsr2/ffx_types.h b/thirdparty/amd-fsr2/ffx_types.h

22
index 74edd192c4..f71b259cce 100644

23
--- a/thirdparty/amd-fsr2/ffx_types.h

24
+++ b/thirdparty/amd-fsr2/ffx_types.h

25
@@ -22,6 +22,7 @@

26
 #pragma once

27
 

28
 #include <stdint.h>

29
+#include <stdlib.h>

30
 

31
 #if defined (FFX_GCC)

32
 /// FidelityFX exported functions

33
diff --git a/thirdparty/amd-fsr2/shaders/ffx_fsr2_accumulate_pass.glsl b/thirdparty/amd-fsr2/shaders/ffx_fsr2_accumulate_pass.glsl

34
index ebbe610ffa..31d68292d4 100644

35
--- a/thirdparty/amd-fsr2/shaders/ffx_fsr2_accumulate_pass.glsl

36
+++ b/thirdparty/amd-fsr2/shaders/ffx_fsr2_accumulate_pass.glsl

37
@@ -19,7 +19,7 @@

38
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

39
 // THE SOFTWARE.

40
 

41
-#version 450

42
+//#version 450

43
 

44
 #extension GL_GOOGLE_include_directive : require

45
 #extension GL_EXT_samplerless_texture_functions : require

46
diff --git a/thirdparty/amd-fsr2/shaders/ffx_fsr2_autogen_reactive_pass.glsl b/thirdparty/amd-fsr2/shaders/ffx_fsr2_autogen_reactive_pass.glsl

47
index 7ae41cf0c1..3b86c17d4d 100644

48
--- a/thirdparty/amd-fsr2/shaders/ffx_fsr2_autogen_reactive_pass.glsl

49
+++ b/thirdparty/amd-fsr2/shaders/ffx_fsr2_autogen_reactive_pass.glsl

50
@@ -19,7 +19,7 @@

51
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

52
 // THE SOFTWARE.

53
 

54
-#version 450

55
+//#version 450

56
 

57
 #extension GL_GOOGLE_include_directive : require

58
 #extension GL_EXT_samplerless_texture_functions : require

59
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

60
index 15186e3bb6..8439c4e9d4 100644

61
--- a/thirdparty/amd-fsr2/shaders/ffx_fsr2_compute_luminance_pyramid_pass.glsl

62
+++ b/thirdparty/amd-fsr2/shaders/ffx_fsr2_compute_luminance_pyramid_pass.glsl

63
@@ -19,7 +19,7 @@

64
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

65
 // THE SOFTWARE.

66
 

67
-#version 450

68
+//#version 450

69
 

70
 #extension GL_GOOGLE_include_directive : require

71
 #extension GL_EXT_samplerless_texture_functions : require

72
diff --git a/thirdparty/amd-fsr2/shaders/ffx_fsr2_depth_clip_pass.glsl b/thirdparty/amd-fsr2/shaders/ffx_fsr2_depth_clip_pass.glsl

73
index fcb2b76528..45ec5bdb86 100644

74
--- a/thirdparty/amd-fsr2/shaders/ffx_fsr2_depth_clip_pass.glsl

75
+++ b/thirdparty/amd-fsr2/shaders/ffx_fsr2_depth_clip_pass.glsl

76
@@ -19,7 +19,7 @@

77
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

78
 // THE SOFTWARE.

79
 

80
-#version 450

81
+//#version 450

82
 

83
 #extension GL_GOOGLE_include_directive : require

84
 #extension GL_EXT_samplerless_texture_functions : require

85
diff --git a/thirdparty/amd-fsr2/shaders/ffx_fsr2_lock_pass.glsl b/thirdparty/amd-fsr2/shaders/ffx_fsr2_lock_pass.glsl

86
index f7cad59c20..7c3a4c2740 100644

87
--- a/thirdparty/amd-fsr2/shaders/ffx_fsr2_lock_pass.glsl

88
+++ b/thirdparty/amd-fsr2/shaders/ffx_fsr2_lock_pass.glsl

89
@@ -19,7 +19,7 @@

90
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

91
 // THE SOFTWARE.

92
 

93
-#version 450

94
+//#version 450

95
 

96
 #extension GL_GOOGLE_include_directive : require

97
 #extension GL_EXT_samplerless_texture_functions : require

98
diff --git a/thirdparty/amd-fsr2/shaders/ffx_fsr2_rcas_pass.glsl b/thirdparty/amd-fsr2/shaders/ffx_fsr2_rcas_pass.glsl

99
index f0823c2bc8..8b4ebc6afc 100644

100
--- a/thirdparty/amd-fsr2/shaders/ffx_fsr2_rcas_pass.glsl

101
+++ b/thirdparty/amd-fsr2/shaders/ffx_fsr2_rcas_pass.glsl

102
@@ -19,7 +19,7 @@

103
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

104
 // THE SOFTWARE.

105
 

106
-#version 450

107
+//#version 450

108
 

109
 #extension GL_GOOGLE_include_directive : require

110
 #extension GL_EXT_samplerless_texture_functions : require

111
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

112
index 20e17eef8c..be4395aaed 100644

113
--- a/thirdparty/amd-fsr2/shaders/ffx_fsr2_reconstruct_previous_depth_pass.glsl

114
+++ b/thirdparty/amd-fsr2/shaders/ffx_fsr2_reconstruct_previous_depth_pass.glsl

115
@@ -19,7 +19,7 @@

116
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

117
 // THE SOFTWARE.

118
 

119
-#version 450

120
+//#version 450

121
 

122
 #extension GL_GOOGLE_include_directive : require

123
 #extension GL_EXT_samplerless_texture_functions : require

124
diff --git a/thirdparty/amd-fsr2/shaders/ffx_fsr2_tcr_autogen_pass.glsl b/thirdparty/amd-fsr2/shaders/ffx_fsr2_tcr_autogen_pass.glsl

125
index bebca91099..7d6a66b8ac 100644

126
--- a/thirdparty/amd-fsr2/shaders/ffx_fsr2_tcr_autogen_pass.glsl

127
+++ b/thirdparty/amd-fsr2/shaders/ffx_fsr2_tcr_autogen_pass.glsl

128
@@ -19,7 +19,7 @@

129
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

130
 // THE SOFTWARE.

131
 

132
-#version 450

133
+//#version 450

134
 

135
 #extension GL_GOOGLE_include_directive : require

136
 #extension GL_EXT_samplerless_texture_functions : require

137


138