Merge branch 'master' into openal_handling_upd

Author: yvt

README.md

@@ -37,7 +37,7 @@ flatpak install flathub jp.yvt.OpenSpades
 
 Once installed, you'll be able to launch OpenSpades from inside the desktop menu or from your terminal with `flatpak run jp.yvt.OpenSpades`
 
-### On Linux (from source)
+### On Unixes (from source)
 
 #### Building
 1. Install dependencies:
@@ -58,6 +58,14 @@ Once installed, you'll be able to launch OpenSpades from inside the desktop menu
      freealut-devel xdg-utils freetype-devel opus-devel opusfile-devel \
      libjpeg-devel libXinerama-devel libXft-devel cmake ImageMagick
    ```
+
+   *On FreeBSD*:
+   ```
+   sudo pkg install gmake automake pkgconf glew openssl curl sdl2 sdl2-image \
+     freealut xdg-utils freetype2 opus opusfile jpeg-turbo libXinerama libXft \
+     cmake ImageMagick7
+   ```
+
    *On other distributions*:
    Install corresponding packages from your repository (or compile from source).
 

Sources/Audio/ALDevice.cpp

@@ -438,7 +438,7 @@ namespace spades {
 	                          dev = NULL;
 				alDevice = al::qalcOpenDevice(dev);
 
-				if (!alDevice) {
+				if (UNLIKELY(!alDevice)) {
 					if ((ext = al::qalcGetString(NULL, ALC_EXTENSIONS))) {
 						std::vector<std::string> strs = Split(ext, " ");
 						SPLog("OpenAL ALC Extensions (NULL):");
@@ -463,7 +463,7 @@ namespace spades {
 				}
 
 				alContext = al::qalcCreateContext(alDevice, NULL);
-				if (!alContext) {
+				if (UNLIKELY(!alContext)) {
 					al::qalcCloseDevice(alDevice);
 					SPRaise("Failed to create OpenAL context.");
 				}
@@ -562,7 +562,7 @@ namespace spades {
 				SPADES_MARK_FUNCTION();
 
 				ALSrc *src = AllocChunk();
-				if (!src)
+				if (UNLIKELY(!src))
 					return;
 
 				src->stereo = chunk->GetFormat() == AL_FORMAT_STEREO16;

Sources/Core/Debug.h

@@ -132,9 +132,16 @@ namespace spades {
 
 #ifdef __GNUC__
 #define DEPRECATED(func) func __attribute__((deprecated))
+#define LIKELY(cond)   __builtin_expect(!!(cond), true)
+#define UNLIKELY(cond) __builtin_expect(!!(cond), false)
 #elif defined(_MSC_VER)
 #define DEPRECATED(func) __declspec(deprecated) func
+#define LIKELY(cond)   (cond)
+#define UNLIKELY(cond) (cond)
 #else
 #pragma message("WARNING: You need to implement DEPRECATED for this compiler")
 #define DEPRECATED(func) func
+#pragma message("WARNING: You need to implement LIKELY/UNLIKELY for this compiler")
+#define LIKELY(cond)   (cond)
+#define UNLIKELY(cond) (cond)
 #endif