Merge pull request #1900 from mstorsjo/x86-32-asm

Hook up the x86_32-only assembly as well
This commit is contained in:
zhilwang 2015-04-19 18:42:29 -07:00
commit 91800fbc49
2 changed files with 5 additions and 2 deletions

View File

@ -17,6 +17,9 @@ ASMFLAGS_PLATFORM = -DX86_32
endif
ifeq ($(USE_ASM),Yes)
CFLAGS += -DX86_ASM
ifneq ($(ENABLE64BIT), Yes)
CFLAGS += -DX86_32_ASM
endif
ASM_ARCH = x86
endif
ASM = nasm

View File

@ -274,9 +274,9 @@ void WelsWriteSliceEndSyn (SSlice* pSlice, bool bEntropyCodingModeFlag) {
void InitCoeffFunc (SWelsFuncPtrList* pFuncList, const uint32_t uiCpuFlag, int32_t iEntropyCodingModeFlag) {
pFuncList->pfCavlcParamCal = CavlcParamCal_c;
#if defined(X86_ASM)
#if defined(X86_32_ASM)
if (uiCpuFlag & WELS_CPU_SSE2) {
// pFuncList->pfCavlcParamCal = CavlcParamCal_sse2;
pFuncList->pfCavlcParamCal = CavlcParamCal_sse2;
}
#endif
if (iEntropyCodingModeFlag) {