summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-05-26 01:48:43 +0300
committerAndrei Karas <akaras@inbox.ru>2017-05-26 01:48:43 +0300
commitcd94be3d8356e713cf5b72c64d22ec5baf5cae4a (patch)
tree0e28534bd2a3fa0e73725234ddbff0d6bf082dd9
parent0057f73324b01518001dc516cfb618fafa7c380d (diff)
downloadmanaverse-cd94be3d8356e713cf5b72c64d22ec5baf5cae4a.tar.gz
manaverse-cd94be3d8356e713cf5b72c64d22ec5baf5cae4a.tar.bz2
manaverse-cd94be3d8356e713cf5b72c64d22ec5baf5cae4a.tar.xz
manaverse-cd94be3d8356e713cf5b72c64d22ec5baf5cae4a.zip
Fix compilation without simd support again.
-rw-r--r--src/resources/dye/dyepalette.cpp2
-rw-r--r--src/resources/dye/dyepalette.h2
2 files changed, 0 insertions, 4 deletions
diff --git a/src/resources/dye/dyepalette.cpp b/src/resources/dye/dyepalette.cpp
index 75e4c567b..65063959b 100644
--- a/src/resources/dye/dyepalette.cpp
+++ b/src/resources/dye/dyepalette.cpp
@@ -44,7 +44,6 @@
#include "debug.h"
-#ifdef SIMD_SUPPORTED
DyeFunctionPtr DyePalette::funcReplaceSColor = nullptr;
DyeFunctionPtr DyePalette::funcReplaceSColorSse2 = nullptr;
DyeFunctionPtr DyePalette::funcReplaceSColorAvx2 = nullptr;
@@ -60,7 +59,6 @@ DyeFunctionPtr DyePalette::funcReplaceAOGLColor = nullptr;
DyeFunctionPtr DyePalette::funcReplaceAOGLColorSse2 = nullptr;
DyeFunctionPtr DyePalette::funcReplaceAOGLColorAvx2 = nullptr;
#endif // USE_OPENGL
-#endif // SIMD_SUPPORTED
DyePalette::DyePalette(const std::string &restrict description,
const uint8_t blockSize) :
diff --git a/src/resources/dye/dyepalette.h b/src/resources/dye/dyepalette.h
index 80e5f53c2..eee7f2327 100644
--- a/src/resources/dye/dyepalette.h
+++ b/src/resources/dye/dyepalette.h
@@ -161,7 +161,6 @@ class DyePalette final
static void initFunctions();
-#ifdef SIMD_SUPPORTED
#ifdef USE_OPENGL
static DyeFunctionPtr funcReplaceSOGLColor;
static DyeFunctionPtr funcReplaceSOGLColorSse2;
@@ -177,7 +176,6 @@ class DyePalette final
static DyeFunctionPtr funcReplaceAColor;
static DyeFunctionPtr funcReplaceAColorSse2;
static DyeFunctionPtr funcReplaceAColorAvx2;
-#endif // SIMD_SUPPORTED
#ifndef UNITTESTS
private: