Disable incompatible optimizations for 32-bit version

This commit is contained in:
Ari Lemmetti 2015-10-24 15:32:27 +03:00
parent ea77560d01
commit d71f1b5bd0
2 changed files with 8 additions and 8 deletions

View file

@ -27,7 +27,7 @@
#include "intra-avx2.h" #include "intra-avx2.h"
#include "strategyselector.h" #include "strategyselector.h"
#if COMPILE_INTEL_AVX2 #if COMPILE_INTEL_AVX2 && defined X86_64
#include <immintrin.h> #include <immintrin.h>
#include "strategies/strategies-common.h" #include "strategies/strategies-common.h"
@ -464,15 +464,15 @@ static void kvz_angular_pred_avx2(
} }
} }
#endif //COMPILE_INTEL_AVX2 #endif //COMPILE_INTEL_AVX2 && defined X86_64
int kvz_strategy_register_intra_avx2(void* opaque, uint8_t bitdepth) int kvz_strategy_register_intra_avx2(void* opaque, uint8_t bitdepth)
{ {
bool success = true; bool success = true;
#if COMPILE_INTEL_AVX2 #if COMPILE_INTEL_AVX2 && defined X86_64
if (bitdepth == 8) { if (bitdepth == 8) {
success &= kvz_strategyselector_register(opaque, "angular_pred", "avx2", 40, &kvz_angular_pred_avx2); success &= kvz_strategyselector_register(opaque, "angular_pred", "avx2", 40, &kvz_angular_pred_avx2);
} }
#endif //COMPILE_INTEL_AVX2 #endif //COMPILE_INTEL_AVX2 && defined X86_64
return success; return success;
} }

View file

@ -32,7 +32,7 @@
#include "transform.h" #include "transform.h"
#include "rdo.h" #include "rdo.h"
#if COMPILE_INTEL_AVX2 #if COMPILE_INTEL_AVX2 && defined X86_64
#include <immintrin.h> #include <immintrin.h>
#include <smmintrin.h> #include <smmintrin.h>
@ -471,20 +471,20 @@ void kvz_dequant_avx2(const encoder_state_t * const state, coeff_t *q_coef, coef
} }
} }
#endif //COMPILE_INTEL_AVX2 #endif //COMPILE_INTEL_AVX2 && defined X86_64
int kvz_strategy_register_quant_avx2(void* opaque, uint8_t bitdepth) int kvz_strategy_register_quant_avx2(void* opaque, uint8_t bitdepth)
{ {
bool success = true; bool success = true;
#if COMPILE_INTEL_AVX2 #if COMPILE_INTEL_AVX2 && defined X86_64
success &= kvz_strategyselector_register(opaque, "quant", "avx2", 40, &kvz_quant_avx2); success &= kvz_strategyselector_register(opaque, "quant", "avx2", 40, &kvz_quant_avx2);
if (bitdepth == 8) { if (bitdepth == 8) {
success &= kvz_strategyselector_register(opaque, "quantize_residual", "avx2", 40, &kvz_quantize_residual_avx2); success &= kvz_strategyselector_register(opaque, "quantize_residual", "avx2", 40, &kvz_quantize_residual_avx2);
success &= kvz_strategyselector_register(opaque, "dequant", "avx2", 40, &kvz_dequant_avx2); success &= kvz_strategyselector_register(opaque, "dequant", "avx2", 40, &kvz_dequant_avx2);
} }
#endif //COMPILE_INTEL_AVX2 #endif //COMPILE_INTEL_AVX2 && defined X86_64
return success; return success;
} }