summaryrefslogtreecommitdiff
path: root/src/resources
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-12-22 17:07:50 +0300
committerAndrei Karas <akaras@inbox.ru>2016-12-22 17:07:50 +0300
commit4aada89a99e81574db3e662b9c354cde0cd4440d (patch)
tree970264d1f52215ad563ce90fd4a86e92e8cbaddf /src/resources
parent04dd5dab7669440d4d5e4bb4d72002ab7fb38912 (diff)
downloadmv-4aada89a99e81574db3e662b9c354cde0cd4440d.tar.gz
mv-4aada89a99e81574db3e662b9c354cde0cd4440d.tar.bz2
mv-4aada89a99e81574db3e662b9c354cde0cd4440d.tar.xz
mv-4aada89a99e81574db3e662b9c354cde0cd4440d.zip
Fix style issues.
Diffstat (limited to 'src/resources')
-rw-r--r--src/resources/dye/dyepalette_replaceacolor.cpp5
-rw-r--r--src/resources/dye/dyepalette_replaceaoglcolor.cpp2
-rw-r--r--src/resources/dye/dyepalette_replacescolor.cpp6
-rw-r--r--src/resources/dye/dyepalette_replacesoglcolor.cpp2
4 files changed, 4 insertions, 11 deletions
diff --git a/src/resources/dye/dyepalette_replaceacolor.cpp b/src/resources/dye/dyepalette_replaceacolor.cpp
index 898928128..cb379a4be 100644
--- a/src/resources/dye/dyepalette_replaceacolor.cpp
+++ b/src/resources/dye/dyepalette_replaceacolor.cpp
@@ -22,8 +22,6 @@
#include "resources/dye/dyepalette.h"
-#include "logger.h"
-
#ifndef SDL_BIG_ENDIAN
#include <SDL_endian.h>
#endif // SDL_BYTEORDER
@@ -162,7 +160,8 @@ void DyePalette::replaceAColorSimd(uint32_t *restrict pixels,
for (int ptr = 0; ptr < bufEnd; ptr += 8)
{
// __m256i base = _mm256_load_si256(reinterpret_cast<__m256i*>(pixels));
- __m256i base = _mm256_loadu_si256(reinterpret_cast<__m256i*>(&pixels[ptr]));
+ __m256i base = _mm256_loadu_si256(reinterpret_cast<__m256i*>(
+ &pixels[ptr]));
std::vector<DyeColor>::const_iterator it = mColors.begin();
while (it != it_end)
diff --git a/src/resources/dye/dyepalette_replaceaoglcolor.cpp b/src/resources/dye/dyepalette_replaceaoglcolor.cpp
index 869f54205..3b643bf92 100644
--- a/src/resources/dye/dyepalette_replaceaoglcolor.cpp
+++ b/src/resources/dye/dyepalette_replaceaoglcolor.cpp
@@ -24,8 +24,6 @@
#include "resources/dye/dyepalette.h"
-#include "logger.h"
-
#ifndef SDL_BIG_ENDIAN
#include <SDL_endian.h>
#endif // SDL_BYTEORDER
diff --git a/src/resources/dye/dyepalette_replacescolor.cpp b/src/resources/dye/dyepalette_replacescolor.cpp
index 0076484c0..94b7c1c5c 100644
--- a/src/resources/dye/dyepalette_replacescolor.cpp
+++ b/src/resources/dye/dyepalette_replacescolor.cpp
@@ -20,8 +20,6 @@
#include "resources/dye/dyepalette.h"
-#include "logger.h"
-
#ifndef SDL_BIG_ENDIAN
#include <SDL_endian.h>
#endif // SDL_BYTEORDER
@@ -159,7 +157,8 @@ void DyePalette::replaceSColorSimd(uint32_t *restrict pixels,
{
__m256i mask = _mm256_set1_epi32(0xffffff00);
// __m256i base = _mm256_load_si256(reinterpret_cast<__m256i*>(pixels));
- __m256i base = _mm256_loadu_si256(reinterpret_cast<__m256i*>(&pixels[ptr]));
+ __m256i base = _mm256_loadu_si256(reinterpret_cast<__m256i*>(
+ &pixels[ptr]));
std::vector<DyeColor>::const_iterator it = mColors.begin();
while (it != it_end)
@@ -220,7 +219,6 @@ void DyePalette::replaceSColorSimd(uint32_t *restrict pixels,
++ it;
}
}
-// logger->log("end");
}
#endif // SIMD_SUPPORTED
diff --git a/src/resources/dye/dyepalette_replacesoglcolor.cpp b/src/resources/dye/dyepalette_replacesoglcolor.cpp
index ceffd664e..6425a3fe2 100644
--- a/src/resources/dye/dyepalette_replacesoglcolor.cpp
+++ b/src/resources/dye/dyepalette_replacesoglcolor.cpp
@@ -22,8 +22,6 @@
#include "resources/dye/dyepalette.h"
-#include "logger.h"
-
#ifndef SDL_BIG_ENDIAN
#include <SDL_endian.h>
#endif // SDL_BYTEORDER