gosu 1.3.0 → 1.4.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (204) hide show
  1. checksums.yaml +4 -4
  2. data/dependencies/SDL/include/SDL.h +108 -14
  3. data/dependencies/SDL/include/SDL_assert.h +81 -50
  4. data/dependencies/SDL/include/SDL_atomic.h +135 -35
  5. data/dependencies/SDL/include/SDL_audio.h +960 -355
  6. data/dependencies/SDL/include/SDL_bits.h +11 -6
  7. data/dependencies/SDL/include/SDL_blendmode.h +91 -14
  8. data/dependencies/SDL/include/SDL_clipboard.h +30 -7
  9. data/dependencies/SDL/include/SDL_config.h +277 -27
  10. data/dependencies/SDL/include/SDL_config_android.h +13 -38
  11. data/dependencies/SDL/include/SDL_config_iphoneos.h +21 -62
  12. data/dependencies/SDL/include/SDL_config_macosx.h +23 -92
  13. data/dependencies/SDL/include/SDL_config_minimal.h +1 -4
  14. data/dependencies/SDL/include/SDL_config_pandora.h +15 -22
  15. data/dependencies/SDL/include/SDL_config_psp.h +16 -37
  16. data/dependencies/SDL/include/SDL_config_windows.h +28 -91
  17. data/dependencies/SDL/include/SDL_config_winrt.h +33 -61
  18. data/dependencies/SDL/include/SDL_config_wiz.h +28 -56
  19. data/dependencies/SDL/include/SDL_copying.h +1 -1
  20. data/dependencies/SDL/include/SDL_cpuinfo.h +331 -71
  21. data/dependencies/SDL/include/SDL_egl.h +906 -280
  22. data/dependencies/SDL/include/SDL_endian.h +101 -47
  23. data/dependencies/SDL/include/SDL_error.h +70 -19
  24. data/dependencies/SDL/include/SDL_events.h +387 -79
  25. data/dependencies/SDL/include/SDL_filesystem.h +73 -64
  26. data/dependencies/SDL/include/SDL_gamecontroller.h +585 -125
  27. data/dependencies/SDL/include/SDL_gesture.h +36 -6
  28. data/dependencies/SDL/include/SDL_haptic.h +304 -210
  29. data/dependencies/SDL/include/SDL_hidapi.h +451 -0
  30. data/dependencies/SDL/include/SDL_hints.h +1286 -897
  31. data/dependencies/SDL/include/SDL_joystick.h +577 -130
  32. data/dependencies/SDL/include/SDL_keyboard.h +162 -63
  33. data/dependencies/SDL/include/SDL_keycode.h +7 -5
  34. data/dependencies/SDL/include/SDL_loadso.h +42 -8
  35. data/dependencies/SDL/include/SDL_locale.h +34 -32
  36. data/dependencies/SDL/include/SDL_log.h +212 -19
  37. data/dependencies/SDL/include/SDL_main.h +72 -17
  38. data/dependencies/SDL/include/SDL_messagebox.h +70 -23
  39. data/dependencies/SDL/include/SDL_metal.h +27 -32
  40. data/dependencies/SDL/include/SDL_misc.h +19 -15
  41. data/dependencies/SDL/include/SDL_mouse.h +262 -110
  42. data/dependencies/SDL/include/SDL_mutex.h +286 -66
  43. data/dependencies/SDL/include/SDL_name.h +1 -1
  44. data/dependencies/SDL/include/SDL_opengl.h +1 -1
  45. data/dependencies/SDL/include/SDL_opengles.h +1 -1
  46. data/dependencies/SDL/include/SDL_opengles2.h +2 -2
  47. data/dependencies/SDL/include/SDL_pixels.h +199 -34
  48. data/dependencies/SDL/include/SDL_platform.h +39 -2
  49. data/dependencies/SDL/include/SDL_power.h +23 -10
  50. data/dependencies/SDL/include/SDL_quit.h +1 -1
  51. data/dependencies/SDL/include/SDL_rect.h +78 -28
  52. data/dependencies/SDL/include/SDL_render.h +1204 -472
  53. data/dependencies/SDL/include/SDL_revision.h +2 -2
  54. data/dependencies/SDL/include/SDL_rwops.h +605 -33
  55. data/dependencies/SDL/include/SDL_scancode.h +1 -1
  56. data/dependencies/SDL/include/SDL_sensor.h +76 -42
  57. data/dependencies/SDL/include/SDL_shape.h +38 -27
  58. data/dependencies/SDL/include/SDL_stdinc.h +96 -24
  59. data/dependencies/SDL/include/SDL_surface.h +571 -139
  60. data/dependencies/SDL/include/SDL_system.h +339 -101
  61. data/dependencies/SDL/include/SDL_syswm.h +50 -20
  62. data/dependencies/SDL/include/SDL_test.h +1 -1
  63. data/dependencies/SDL/include/SDL_test_assert.h +2 -2
  64. data/dependencies/SDL/include/SDL_test_common.h +23 -6
  65. data/dependencies/SDL/include/SDL_test_compare.h +1 -1
  66. data/dependencies/SDL/include/SDL_test_crc32.h +1 -1
  67. data/dependencies/SDL/include/SDL_test_font.h +3 -3
  68. data/dependencies/SDL/include/SDL_test_fuzzer.h +28 -26
  69. data/dependencies/SDL/include/SDL_test_harness.h +6 -6
  70. data/dependencies/SDL/include/SDL_test_images.h +1 -1
  71. data/dependencies/SDL/include/SDL_test_log.h +1 -1
  72. data/dependencies/SDL/include/SDL_test_md5.h +1 -1
  73. data/dependencies/SDL/include/SDL_test_memory.h +1 -1
  74. data/dependencies/SDL/include/SDL_test_random.h +2 -2
  75. data/dependencies/SDL/include/SDL_thread.h +226 -128
  76. data/dependencies/SDL/include/SDL_timer.h +129 -22
  77. data/dependencies/SDL/include/SDL_touch.h +48 -8
  78. data/dependencies/SDL/include/SDL_types.h +1 -1
  79. data/dependencies/SDL/include/SDL_version.h +72 -46
  80. data/dependencies/SDL/include/SDL_video.h +1266 -460
  81. data/dependencies/SDL/include/SDL_vulkan.h +100 -161
  82. data/dependencies/SDL/include/begin_code.h +22 -1
  83. data/dependencies/SDL/include/close_code.h +1 -1
  84. data/dependencies/SDL/lib/x64/libSDL2.dll.a +0 -0
  85. data/dependencies/SDL/lib/x86/libSDL2.dll.a +0 -0
  86. data/dependencies/SDL_sound/SDL_sound.c +83 -7
  87. data/dependencies/SDL_sound/SDL_sound.h +4 -4
  88. data/dependencies/SDL_sound/SDL_sound_aiff.c +9 -12
  89. data/dependencies/SDL_sound/SDL_sound_au.c +7 -7
  90. data/dependencies/SDL_sound/SDL_sound_coreaudio.c +3 -3
  91. data/dependencies/SDL_sound/SDL_sound_flac.c +1 -1
  92. data/dependencies/SDL_sound/SDL_sound_internal.h +17 -10
  93. data/dependencies/SDL_sound/SDL_sound_modplug.c +25 -27
  94. data/dependencies/SDL_sound/SDL_sound_mp3.c +5 -17
  95. data/dependencies/SDL_sound/SDL_sound_raw.c +11 -11
  96. data/dependencies/SDL_sound/SDL_sound_shn.c +8 -7
  97. data/dependencies/SDL_sound/SDL_sound_voc.c +6 -4
  98. data/dependencies/SDL_sound/SDL_sound_vorbis.c +6 -11
  99. data/dependencies/SDL_sound/SDL_sound_wav.c +35 -29
  100. data/dependencies/SDL_sound/dr_flac.h +618 -220
  101. data/dependencies/SDL_sound/dr_mp3.h +263 -94
  102. data/dependencies/SDL_sound/libmodplug/fastmix.c +58 -64
  103. data/dependencies/SDL_sound/libmodplug/libmodplug.h +25 -103
  104. data/dependencies/SDL_sound/libmodplug/load_669.c +14 -17
  105. data/dependencies/SDL_sound/libmodplug/load_amf.c +11 -7
  106. data/dependencies/SDL_sound/libmodplug/load_ams.c +65 -22
  107. data/dependencies/SDL_sound/libmodplug/load_dbm.c +8 -4
  108. data/dependencies/SDL_sound/libmodplug/load_dmf.c +55 -25
  109. data/dependencies/SDL_sound/libmodplug/load_far.c +9 -13
  110. data/dependencies/SDL_sound/libmodplug/load_gdm.c +448 -0
  111. data/dependencies/SDL_sound/libmodplug/load_it.c +45 -49
  112. data/dependencies/SDL_sound/libmodplug/load_mdl.c +80 -53
  113. data/dependencies/SDL_sound/libmodplug/load_med.c +20 -12
  114. data/dependencies/SDL_sound/libmodplug/load_mod.c +40 -15
  115. data/dependencies/SDL_sound/libmodplug/load_mt2.c +29 -17
  116. data/dependencies/SDL_sound/libmodplug/load_okt.c +12 -8
  117. data/dependencies/SDL_sound/libmodplug/load_psm.c +101 -78
  118. data/dependencies/SDL_sound/libmodplug/load_ptm.c +18 -17
  119. data/dependencies/SDL_sound/libmodplug/load_s3m.c +9 -7
  120. data/dependencies/SDL_sound/libmodplug/load_stm.c +3 -2
  121. data/dependencies/SDL_sound/libmodplug/load_ult.c +2 -2
  122. data/dependencies/SDL_sound/libmodplug/load_umx.c +315 -35
  123. data/dependencies/SDL_sound/libmodplug/load_xm.c +25 -21
  124. data/dependencies/SDL_sound/libmodplug/mmcmp.c +295 -149
  125. data/dependencies/SDL_sound/libmodplug/modplug.c +7 -123
  126. data/dependencies/SDL_sound/libmodplug/modplug.h +32 -29
  127. data/dependencies/SDL_sound/libmodplug/snd_dsp.c +0 -1
  128. data/dependencies/SDL_sound/libmodplug/snd_flt.c +2 -2
  129. data/dependencies/SDL_sound/libmodplug/snd_fx.c +24 -18
  130. data/dependencies/SDL_sound/libmodplug/sndfile.c +55 -156
  131. data/dependencies/SDL_sound/libmodplug/sndmix.c +7 -12
  132. data/dependencies/SDL_sound/libmodplug/tables.h +10 -15
  133. data/dependencies/SDL_sound/stb_vorbis.h +508 -325
  134. data/dependencies/{al_soft → mojoAL}/AL/al.h +38 -30
  135. data/dependencies/{al_soft → mojoAL}/AL/alc.h +27 -56
  136. data/dependencies/mojoAL/mojoal.c +4594 -0
  137. data/ext/gosu/extconf.rb +29 -30
  138. data/include/Gosu/Audio.hpp +70 -85
  139. data/include/Gosu/Color.hpp +19 -11
  140. data/include/Gosu/Font.hpp +40 -44
  141. data/include/Gosu/Graphics.hpp +58 -71
  142. data/include/Gosu/GraphicsBase.hpp +26 -33
  143. data/include/Gosu/Image.hpp +56 -62
  144. data/include/Gosu/ImageData.hpp +23 -27
  145. data/include/Gosu/Inspection.hpp +1 -4
  146. data/include/Gosu/TextInput.hpp +34 -40
  147. data/include/Gosu/Version.hpp +1 -1
  148. data/include/Gosu/Window.hpp +71 -70
  149. data/lib/SDL2.dll +0 -0
  150. data/lib/gosu/compat.rb +24 -37
  151. data/lib/gosu.rb +2 -2
  152. data/lib64/SDL2.dll +0 -0
  153. data/src/Audio.cpp +86 -86
  154. data/src/AudioFile.hpp +6 -6
  155. data/src/AudioFileAudioToolbox.cpp +1 -1
  156. data/src/AudioFileSDLSound.cpp +1 -1
  157. data/src/AudioImpl.hpp +5 -5
  158. data/src/BitmapIO.cpp +0 -20
  159. data/src/BlockAllocator.cpp +2 -1
  160. data/src/Channel.cpp +22 -20
  161. data/src/Color.cpp +12 -9
  162. data/src/EmptyImageData.hpp +15 -17
  163. data/src/FileUnix.cpp +1 -1
  164. data/src/FileWin.cpp +1 -1
  165. data/src/Font.cpp +48 -53
  166. data/src/Graphics.cpp +135 -143
  167. data/src/Image.cpp +41 -42
  168. data/src/Input.cpp +1 -1
  169. data/src/InputUIKit.cpp +1 -1
  170. data/src/LargeImageData.cpp +108 -101
  171. data/src/LargeImageData.hpp +17 -15
  172. data/src/Log.hpp +6 -6
  173. data/src/Macro.cpp +35 -37
  174. data/src/Macro.hpp +11 -11
  175. data/src/Math.cpp +8 -1
  176. data/src/Resolution.cpp +12 -7
  177. data/src/RubyGosu.cxx +5 -5
  178. data/src/TexChunk.cpp +50 -41
  179. data/src/TexChunk.hpp +22 -22
  180. data/src/Text.cpp +37 -37
  181. data/src/TextBuilder.cpp +60 -57
  182. data/src/TextBuilder.hpp +20 -20
  183. data/src/TextInput.cpp +127 -135
  184. data/src/TrueTypeFont.cpp +107 -107
  185. data/src/TrueTypeFont.hpp +39 -38
  186. data/src/TrueTypeFontApple.cpp +19 -22
  187. data/src/TrueTypeFontUnix.cpp +21 -26
  188. data/src/TrueTypeFontWin.cpp +30 -30
  189. data/src/Window.cpp +95 -86
  190. data/src/WindowUIKit.cpp +46 -49
  191. metadata +7 -17
  192. data/dependencies/SDL/include/SDL_config_os2.h +0 -188
  193. data/dependencies/SDL_sound/libmodplug/load_abc.c +0 -4725
  194. data/dependencies/SDL_sound/libmodplug/load_mid.c +0 -1405
  195. data/dependencies/SDL_sound/libmodplug/load_pat.c +0 -1143
  196. data/dependencies/SDL_sound/libmodplug/load_pat.h +0 -25
  197. data/dependencies/al_soft/AL/alext.h +0 -585
  198. data/dependencies/al_soft/AL/efx-creative.h +0 -3
  199. data/dependencies/al_soft/AL/efx-presets.h +0 -402
  200. data/dependencies/al_soft/AL/efx.h +0 -762
  201. data/dependencies/al_soft/x64/libOpenAL32.dll.a +0 -0
  202. data/dependencies/al_soft/x86/libOpenAL32.dll.a +0 -0
  203. data/lib/OpenAL32.dll +0 -0
  204. data/lib64/OpenAL32.dll +0 -0
@@ -1,6 +1,6 @@
1
1
  /*
2
2
  Simple DirectMedia Layer
3
- Copyright (C) 1997-2020 Sam Lantinga <slouken@libsdl.org>
3
+ Copyright (C) 1997-2022 Sam Lantinga <slouken@libsdl.org>
4
4
 
5
5
  This software is provided 'as-is', without any express or implied
6
6
  warranty. In no event will the authors be held liable for any damages
@@ -30,6 +30,23 @@
30
30
 
31
31
  #include "SDL_stdinc.h"
32
32
 
33
+ #if defined(_MSC_VER) && (_MSC_VER >= 1400)
34
+ /* As of Clang 11, '_m_prefetchw' is conflicting with the winnt.h's version,
35
+ so we define the needed '_m_prefetch' here as a pseudo-header, until the issue is fixed. */
36
+ #ifdef __clang__
37
+ #ifndef __PRFCHWINTRIN_H
38
+ #define __PRFCHWINTRIN_H
39
+ static __inline__ void __attribute__((__always_inline__, __nodebug__))
40
+ _m_prefetch(void *__P)
41
+ {
42
+ __builtin_prefetch (__P, 0, 3 /* _MM_HINT_T0 */);
43
+ }
44
+ #endif /* __PRFCHWINTRIN_H */
45
+ #endif /* __clang__ */
46
+
47
+ #include <intrin.h>
48
+ #endif
49
+
33
50
  /**
34
51
  * \name The two types of endianness
35
52
  */
@@ -45,6 +62,9 @@
45
62
  #elif defined(__OpenBSD__)
46
63
  #include <endian.h>
47
64
  #define SDL_BYTEORDER BYTE_ORDER
65
+ #elif defined(__FreeBSD__) || defined(__NetBSD__)
66
+ #include <sys/endian.h>
67
+ #define SDL_BYTEORDER BYTE_ORDER
48
68
  #else
49
69
  #if defined(__hppa__) || \
50
70
  defined(__m68k__) || defined(mc68000) || defined(_M_M68K) || \
@@ -68,22 +88,45 @@ extern "C" {
68
88
  /**
69
89
  * \file SDL_endian.h
70
90
  */
71
- #if defined(__GNUC__) && defined(__i386__) && \
72
- !(__GNUC__ == 2 && __GNUC_MINOR__ == 95 /* broken gcc version */)
91
+
92
+ /* various modern compilers may have builtin swap */
93
+ #if defined(__GNUC__) || defined(__clang__)
94
+ # define HAS_BUILTIN_BSWAP16 (_SDL_HAS_BUILTIN(__builtin_bswap16)) || \
95
+ (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8))
96
+ # define HAS_BUILTIN_BSWAP32 (_SDL_HAS_BUILTIN(__builtin_bswap32)) || \
97
+ (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3))
98
+ # define HAS_BUILTIN_BSWAP64 (_SDL_HAS_BUILTIN(__builtin_bswap64)) || \
99
+ (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3))
100
+
101
+ /* this one is broken */
102
+ # define HAS_BROKEN_BSWAP (__GNUC__ == 2 && __GNUC_MINOR__ <= 95)
103
+ #else
104
+ # define HAS_BUILTIN_BSWAP16 0
105
+ # define HAS_BUILTIN_BSWAP32 0
106
+ # define HAS_BUILTIN_BSWAP64 0
107
+ # define HAS_BROKEN_BSWAP 0
108
+ #endif
109
+
110
+ #if HAS_BUILTIN_BSWAP16
111
+ #define SDL_Swap16(x) __builtin_bswap16(x)
112
+ #elif defined(_MSC_VER) && (_MSC_VER >= 1400)
113
+ #pragma intrinsic(_byteswap_ushort)
114
+ #define SDL_Swap16(x) _byteswap_ushort(x)
115
+ #elif defined(__i386__) && !HAS_BROKEN_BSWAP
73
116
  SDL_FORCE_INLINE Uint16
74
117
  SDL_Swap16(Uint16 x)
75
118
  {
76
119
  __asm__("xchgb %b0,%h0": "=q"(x):"0"(x));
77
120
  return x;
78
121
  }
79
- #elif defined(__GNUC__) && defined(__x86_64__)
122
+ #elif defined(__x86_64__)
80
123
  SDL_FORCE_INLINE Uint16
81
124
  SDL_Swap16(Uint16 x)
82
125
  {
83
126
  __asm__("xchgb %b0,%h0": "=Q"(x):"0"(x));
84
127
  return x;
85
128
  }
86
- #elif defined(__GNUC__) && (defined(__powerpc__) || defined(__ppc__))
129
+ #elif (defined(__powerpc__) || defined(__ppc__))
87
130
  SDL_FORCE_INLINE Uint16
88
131
  SDL_Swap16(Uint16 x)
89
132
  {
@@ -92,7 +135,7 @@ SDL_Swap16(Uint16 x)
92
135
  __asm__("rlwimi %0,%2,8,16,23": "=&r"(result):"0"(x >> 8), "r"(x));
93
136
  return (Uint16)result;
94
137
  }
95
- #elif defined(__GNUC__) && (defined(__M68000__) || defined(__M68020__)) && !defined(__mcoldfire__)
138
+ #elif (defined(__m68k__) && !defined(__mcoldfire__))
96
139
  SDL_FORCE_INLINE Uint16
97
140
  SDL_Swap16(Uint16 x)
98
141
  {
@@ -100,7 +143,7 @@ SDL_Swap16(Uint16 x)
100
143
  return x;
101
144
  }
102
145
  #elif defined(__WATCOMC__) && defined(__386__)
103
- extern _inline Uint16 SDL_Swap16(Uint16);
146
+ extern __inline Uint16 SDL_Swap16(Uint16);
104
147
  #pragma aux SDL_Swap16 = \
105
148
  "xchg al, ah" \
106
149
  parm [ax] \
@@ -113,32 +156,37 @@ SDL_Swap16(Uint16 x)
113
156
  }
114
157
  #endif
115
158
 
116
- #if defined(__GNUC__) && defined(__i386__)
159
+ #if HAS_BUILTIN_BSWAP32
160
+ #define SDL_Swap32(x) __builtin_bswap32(x)
161
+ #elif defined(_MSC_VER) && (_MSC_VER >= 1400)
162
+ #pragma intrinsic(_byteswap_ulong)
163
+ #define SDL_Swap32(x) _byteswap_ulong(x)
164
+ #elif defined(__i386__) && !HAS_BROKEN_BSWAP
117
165
  SDL_FORCE_INLINE Uint32
118
166
  SDL_Swap32(Uint32 x)
119
167
  {
120
168
  __asm__("bswap %0": "=r"(x):"0"(x));
121
169
  return x;
122
170
  }
123
- #elif defined(__GNUC__) && defined(__x86_64__)
171
+ #elif defined(__x86_64__)
124
172
  SDL_FORCE_INLINE Uint32
125
173
  SDL_Swap32(Uint32 x)
126
174
  {
127
175
  __asm__("bswapl %0": "=r"(x):"0"(x));
128
176
  return x;
129
177
  }
130
- #elif defined(__GNUC__) && (defined(__powerpc__) || defined(__ppc__))
178
+ #elif (defined(__powerpc__) || defined(__ppc__))
131
179
  SDL_FORCE_INLINE Uint32
132
180
  SDL_Swap32(Uint32 x)
133
181
  {
134
182
  Uint32 result;
135
183
 
136
- __asm__("rlwimi %0,%2,24,16,23": "=&r"(result):"0"(x >> 24), "r"(x));
137
- __asm__("rlwimi %0,%2,8,8,15": "=&r"(result):"0"(result), "r"(x));
138
- __asm__("rlwimi %0,%2,24,0,7": "=&r"(result):"0"(result), "r"(x));
184
+ __asm__("rlwimi %0,%2,24,16,23": "=&r"(result): "0" (x>>24), "r"(x));
185
+ __asm__("rlwimi %0,%2,8,8,15" : "=&r"(result): "0" (result), "r"(x));
186
+ __asm__("rlwimi %0,%2,24,0,7" : "=&r"(result): "0" (result), "r"(x));
139
187
  return result;
140
188
  }
141
- #elif defined(__GNUC__) && (defined(__M68000__) || defined(__M68020__)) && !defined(__mcoldfire__)
189
+ #elif (defined(__m68k__) && !defined(__mcoldfire__))
142
190
  SDL_FORCE_INLINE Uint32
143
191
  SDL_Swap32(Uint32 x)
144
192
  {
@@ -146,20 +194,11 @@ SDL_Swap32(Uint32 x)
146
194
  return x;
147
195
  }
148
196
  #elif defined(__WATCOMC__) && defined(__386__)
149
- extern _inline Uint32 SDL_Swap32(Uint32);
150
- #ifndef __SW_3 /* 486+ */
197
+ extern __inline Uint32 SDL_Swap32(Uint32);
151
198
  #pragma aux SDL_Swap32 = \
152
199
  "bswap eax" \
153
200
  parm [eax] \
154
201
  modify [eax];
155
- #else /* 386-only */
156
- #pragma aux SDL_Swap32 = \
157
- "xchg al, ah" \
158
- "ror eax, 16" \
159
- "xchg al, ah" \
160
- parm [eax] \
161
- modify [eax];
162
- #endif
163
202
  #else
164
203
  SDL_FORCE_INLINE Uint32
165
204
  SDL_Swap32(Uint32 x)
@@ -169,31 +208,42 @@ SDL_Swap32(Uint32 x)
169
208
  }
170
209
  #endif
171
210
 
172
- #if defined(__GNUC__) && defined(__i386__)
211
+ #if HAS_BUILTIN_BSWAP64
212
+ #define SDL_Swap64(x) __builtin_bswap64(x)
213
+ #elif defined(_MSC_VER) && (_MSC_VER >= 1400)
214
+ #pragma intrinsic(_byteswap_uint64)
215
+ #define SDL_Swap64(x) _byteswap_uint64(x)
216
+ #elif defined(__i386__) && !HAS_BROKEN_BSWAP
173
217
  SDL_FORCE_INLINE Uint64
174
218
  SDL_Swap64(Uint64 x)
175
219
  {
176
- union
177
- {
178
- struct
179
- {
220
+ union {
221
+ struct {
180
222
  Uint32 a, b;
181
223
  } s;
182
224
  Uint64 u;
183
225
  } v;
184
226
  v.u = x;
185
- __asm__("bswapl %0 ; bswapl %1 ; xchgl %0,%1": "=r"(v.s.a), "=r"(v.s.b):"0"(v.s.a),
186
- "1"(v.s.
187
- b));
227
+ __asm__("bswapl %0 ; bswapl %1 ; xchgl %0,%1"
228
+ : "=r"(v.s.a), "=r"(v.s.b)
229
+ : "0" (v.s.a), "1"(v.s.b));
188
230
  return v.u;
189
231
  }
190
- #elif defined(__GNUC__) && defined(__x86_64__)
232
+ #elif defined(__x86_64__)
191
233
  SDL_FORCE_INLINE Uint64
192
234
  SDL_Swap64(Uint64 x)
193
235
  {
194
236
  __asm__("bswapq %0": "=r"(x):"0"(x));
195
237
  return x;
196
238
  }
239
+ #elif defined(__WATCOMC__) && defined(__386__)
240
+ extern __inline Uint64 SDL_Swap64(Uint64);
241
+ #pragma aux SDL_Swap64 = \
242
+ "bswap eax" \
243
+ "bswap edx" \
244
+ "xchg eax,edx" \
245
+ parm [eax edx] \
246
+ modify [eax edx];
197
247
  #else
198
248
  SDL_FORCE_INLINE Uint64
199
249
  SDL_Swap64(Uint64 x)
@@ -215,8 +265,7 @@ SDL_Swap64(Uint64 x)
215
265
  SDL_FORCE_INLINE float
216
266
  SDL_SwapFloat(float x)
217
267
  {
218
- union
219
- {
268
+ union {
220
269
  float f;
221
270
  Uint32 ui32;
222
271
  } swapper;
@@ -225,6 +274,11 @@ SDL_SwapFloat(float x)
225
274
  return swapper.f;
226
275
  }
227
276
 
277
+ /* remove extra macros */
278
+ #undef HAS_BROKEN_BSWAP
279
+ #undef HAS_BUILTIN_BSWAP16
280
+ #undef HAS_BUILTIN_BSWAP32
281
+ #undef HAS_BUILTIN_BSWAP64
228
282
 
229
283
  /**
230
284
  * \name Swap to native
@@ -232,22 +286,22 @@ SDL_SwapFloat(float x)
232
286
  */
233
287
  /* @{ */
234
288
  #if SDL_BYTEORDER == SDL_LIL_ENDIAN
235
- #define SDL_SwapLE16(X) (X)
236
- #define SDL_SwapLE32(X) (X)
237
- #define SDL_SwapLE64(X) (X)
289
+ #define SDL_SwapLE16(X) (X)
290
+ #define SDL_SwapLE32(X) (X)
291
+ #define SDL_SwapLE64(X) (X)
238
292
  #define SDL_SwapFloatLE(X) (X)
239
- #define SDL_SwapBE16(X) SDL_Swap16(X)
240
- #define SDL_SwapBE32(X) SDL_Swap32(X)
241
- #define SDL_SwapBE64(X) SDL_Swap64(X)
293
+ #define SDL_SwapBE16(X) SDL_Swap16(X)
294
+ #define SDL_SwapBE32(X) SDL_Swap32(X)
295
+ #define SDL_SwapBE64(X) SDL_Swap64(X)
242
296
  #define SDL_SwapFloatBE(X) SDL_SwapFloat(X)
243
297
  #else
244
- #define SDL_SwapLE16(X) SDL_Swap16(X)
245
- #define SDL_SwapLE32(X) SDL_Swap32(X)
246
- #define SDL_SwapLE64(X) SDL_Swap64(X)
298
+ #define SDL_SwapLE16(X) SDL_Swap16(X)
299
+ #define SDL_SwapLE32(X) SDL_Swap32(X)
300
+ #define SDL_SwapLE64(X) SDL_Swap64(X)
247
301
  #define SDL_SwapFloatLE(X) SDL_SwapFloat(X)
248
- #define SDL_SwapBE16(X) (X)
249
- #define SDL_SwapBE32(X) (X)
250
- #define SDL_SwapBE64(X) (X)
302
+ #define SDL_SwapBE16(X) (X)
303
+ #define SDL_SwapBE32(X) (X)
304
+ #define SDL_SwapBE64(X) (X)
251
305
  #define SDL_SwapFloatBE(X) (X)
252
306
  #endif
253
307
  /* @} *//* Swap to native */
@@ -1,6 +1,6 @@
1
1
  /*
2
2
  Simple DirectMedia Layer
3
- Copyright (C) 1997-2020 Sam Lantinga <slouken@libsdl.org>
3
+ Copyright (C) 1997-2022 Sam Lantinga <slouken@libsdl.org>
4
4
 
5
5
  This software is provided 'as-is', without any express or implied
6
6
  warranty. In no event will the authors be held liable for any damages
@@ -40,41 +40,92 @@ extern "C" {
40
40
 
41
41
 
42
42
  /**
43
- * \brief Set the error message for the current thread
43
+ * Set the SDL error message for the current thread.
44
44
  *
45
- * \return -1, there is no error handling for this function
45
+ * Calling this function will replace any previous error message that was set.
46
+ *
47
+ * This function always returns -1, since SDL frequently uses -1 to signify an
48
+ * failing result, leading to this idiom:
49
+ *
50
+ * ```c
51
+ * if (error_code) {
52
+ * return SDL_SetError("This operation has failed: %d", error_code);
53
+ * }
54
+ * ```
55
+ *
56
+ * \param fmt a printf()-style message format string
57
+ * \param ... additional parameters matching % tokens in the `fmt` string, if
58
+ * any
59
+ * \returns always -1.
60
+ *
61
+ * \since This function is available since SDL 2.0.0.
62
+ *
63
+ * \sa SDL_ClearError
64
+ * \sa SDL_GetError
46
65
  */
47
66
  extern DECLSPEC int SDLCALL SDL_SetError(SDL_PRINTF_FORMAT_STRING const char *fmt, ...) SDL_PRINTF_VARARG_FUNC(1);
48
67
 
49
68
  /**
50
- * \brief Get the last error message that was set
69
+ * Retrieve a message about the last error that occurred on the current
70
+ * thread.
71
+ *
72
+ * It is possible for multiple errors to occur before calling SDL_GetError().
73
+ * Only the last error is returned.
74
+ *
75
+ * The message is only applicable when an SDL function has signaled an error.
76
+ * You must check the return values of SDL function calls to determine when to
77
+ * appropriately call SDL_GetError(). You should *not* use the results of
78
+ * SDL_GetError() to decide if an error has occurred! Sometimes SDL will set
79
+ * an error string even when reporting success.
80
+ *
81
+ * SDL will *not* clear the error string for successful API calls. You *must*
82
+ * check return values for failure cases before you can assume the error
83
+ * string applies.
51
84
  *
52
- * SDL API functions may set error messages and then succeed, so you should
53
- * only use the error value if a function fails.
54
- *
55
- * This returns a pointer to a static buffer for convenience and should not
56
- * be called by multiple threads simultaneously.
85
+ * Error strings are set per-thread, so an error set in a different thread
86
+ * will not interfere with the current thread's operation.
57
87
  *
58
- * \return a pointer to the last error message that was set
88
+ * The returned string is internally allocated and must not be freed by the
89
+ * application.
90
+ *
91
+ * \returns a message with information about the specific error that occurred,
92
+ * or an empty string if there hasn't been an error message set since
93
+ * the last call to SDL_ClearError(). The message is only applicable
94
+ * when an SDL function has signaled an error. You must check the
95
+ * return values of SDL function calls to determine when to
96
+ * appropriately call SDL_GetError().
97
+ *
98
+ * \since This function is available since SDL 2.0.0.
99
+ *
100
+ * \sa SDL_ClearError
101
+ * \sa SDL_SetError
59
102
  */
60
103
  extern DECLSPEC const char *SDLCALL SDL_GetError(void);
61
104
 
62
105
  /**
63
- * \brief Get the last error message that was set for the current thread
106
+ * Get the last error message that was set for the current thread.
107
+ *
108
+ * This allows the caller to copy the error string into a provided buffer, but
109
+ * otherwise operates exactly the same as SDL_GetError().
64
110
  *
65
- * SDL API functions may set error messages and then succeed, so you should
66
- * only use the error value if a function fails.
67
- *
68
- * \param errstr A buffer to fill with the last error message that was set
69
- * for the current thread
70
- * \param maxlen The size of the buffer pointed to by the errstr parameter
111
+ * \param errstr A buffer to fill with the last error message that was set for
112
+ * the current thread
113
+ * \param maxlen The size of the buffer pointed to by the errstr parameter
114
+ * \returns the pointer passed in as the `errstr` parameter.
71
115
  *
72
- * \return errstr
116
+ * \since This function is available since SDL 2.0.14.
117
+ *
118
+ * \sa SDL_GetError
73
119
  */
74
120
  extern DECLSPEC char * SDLCALL SDL_GetErrorMsg(char *errstr, int maxlen);
75
121
 
76
122
  /**
77
- * \brief Clear the error message for the current thread
123
+ * Clear any previous error message for this thread.
124
+ *
125
+ * \since This function is available since SDL 2.0.0.
126
+ *
127
+ * \sa SDL_GetError
128
+ * \sa SDL_SetError
78
129
  */
79
130
  extern DECLSPEC void SDLCALL SDL_ClearError(void);
80
131