From 4b4dce1bd9bba3d1d12d23343d58c4040ae09c3a Mon Sep 17 00:00:00 2001 From: degasus Date: Thu, 21 Feb 2013 13:00:19 +0100 Subject: [PATCH] build fix --- Source/Core/VideoCommon/Src/VertexLoader_Position.cpp | 8 ++++---- Source/Core/VideoCommon/Src/VertexLoader_TextCoord.cpp | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Source/Core/VideoCommon/Src/VertexLoader_Position.cpp b/Source/Core/VideoCommon/Src/VertexLoader_Position.cpp index 3fa74fb747..14f2819260 100644 --- a/Source/Core/VideoCommon/Src/VertexLoader_Position.cpp +++ b/Source/Core/VideoCommon/Src/VertexLoader_Position.cpp @@ -84,7 +84,7 @@ float PosScale(float val) { return val; } template -LOADERDECL void Pos_ReadDirect() +void LOADERDECL Pos_ReadDirect() { static_assert(N <= 3, "N > 3 is not sane!"); @@ -100,7 +100,7 @@ LOADERDECL void Pos_ReadDirect() } template -LOADERDECL void Pos_ReadIndex() +void LOADERDECL Pos_ReadIndex() { static_assert(!std::numeric_limits::is_signed, "Only unsigned I is sane!"); static_assert(N <= 3, "N > 3 is not sane!"); @@ -127,12 +127,12 @@ static const __m128i kMaskSwap32_3 = _mm_set_epi32(0xFFFFFFFFL, 0x08090A0BL, 0x0 static const __m128i kMaskSwap32_2 = _mm_set_epi32(0xFFFFFFFFL, 0xFFFFFFFFL, 0x04050607L, 0x00010203L); template -LOADERDECL void Pos_ReadIndex_Float_SSSE3() +void LOADERDECL Pos_ReadIndex_Float_SSSE3() { auto const index = DataRead(); if (index < std::numeric_limits::max()) { - const u32* pData = (const u32 *)(cached_arraybases[ARRAY_POSITION] + (Index * arraystrides[ARRAY_POSITION])); + const u32* pData = (const u32 *)(cached_arraybases[ARRAY_POSITION] + (index * arraystrides[ARRAY_POSITION])); GC_ALIGNED128(const __m128i a = _mm_loadu_si128((__m128i*)pData)); GC_ALIGNED128(__m128i b = _mm_shuffle_epi8(a, three ? kMaskSwap32_3 : kMaskSwap32_2)); _mm_storeu_si128((__m128i*)VertexManager::s_pCurBufferPointer, b); diff --git a/Source/Core/VideoCommon/Src/VertexLoader_TextCoord.cpp b/Source/Core/VideoCommon/Src/VertexLoader_TextCoord.cpp index 33efe33bdf..52f9d26ad3 100644 --- a/Source/Core/VideoCommon/Src/VertexLoader_TextCoord.cpp +++ b/Source/Core/VideoCommon/Src/VertexLoader_TextCoord.cpp @@ -112,7 +112,7 @@ void LOADERDECL TexCoord_ReadIndex16_Short2_SSE4() const __m128 e = _mm_load1_ps(&tcScale[tcIndex]); const __m128 f = _mm_mul_ps(d, e); _mm_storeu_ps((float*)VertexManager::s_pCurBufferPointer, f); - LOG_TEX2(); + LOG_TEX<2>(); VertexManager::s_pCurBufferPointer += 8; tcIndex++; } @@ -128,7 +128,7 @@ void LOADERDECL TexCoord_ReadIndex16_Float2_SSSE3() GC_ALIGNED128(const __m128i a = _mm_loadl_epi64((__m128i*)pData)); GC_ALIGNED128(const __m128i b = _mm_shuffle_epi8(a, kMaskSwap32)); _mm_storel_epi64((__m128i*)VertexManager::s_pCurBufferPointer, b); - LOG_TEX2(); + LOG_TEX<2>(); VertexManager::s_pCurBufferPointer += 8; tcIndex++; }