VertexLoader: load scale factor as const, this will save some assembler instructions

This commit is contained in:
degasus 2014-01-21 18:54:16 +01:00
parent f90fe90320
commit c613868f57
2 changed files with 15 additions and 10 deletions

View File

@ -61,13 +61,13 @@ MOVUPS(MOffset(EDI, 0), XMM0);
*/ */
template <typename T> template <typename T>
float PosScale(T val) float PosScale(T val, float scale)
{ {
return val * posScale; return val * scale;
} }
template <> template <>
float PosScale(float val) float PosScale(float val, float scale)
{ {
return val; return val;
} }
@ -76,9 +76,10 @@ template <typename T, int N>
void LOADERDECL Pos_ReadDirect() void LOADERDECL Pos_ReadDirect()
{ {
static_assert(N <= 3, "N > 3 is not sane!"); static_assert(N <= 3, "N > 3 is not sane!");
auto const scale = posScale;
for (int i = 0; i < 3; ++i) for (int i = 0; i < 3; ++i)
DataWrite(i<N ? PosScale(DataRead<T>()) : 0.f); DataWrite(i<N ? PosScale(DataRead<T>(), scale) : 0.f);
LOG_VTX(); LOG_VTX();
} }
@ -91,9 +92,10 @@ void LOADERDECL Pos_ReadIndex()
auto const index = DataRead<I>(); auto const index = DataRead<I>();
auto const data = reinterpret_cast<const T*>(cached_arraybases[ARRAY_POSITION] + (index * arraystrides[ARRAY_POSITION])); auto const data = reinterpret_cast<const T*>(cached_arraybases[ARRAY_POSITION] + (index * arraystrides[ARRAY_POSITION]));
auto const scale = posScale;
for (int i = 0; i < 3; ++i) for (int i = 0; i < 3; ++i)
DataWrite(i<N ? PosScale(Common::FromBigEndian(data[i])) : 0.f); DataWrite(i<N ? PosScale(Common::FromBigEndian(data[i]), scale) : 0.f);
LOG_VTX(); LOG_VTX();
} }

View File

@ -41,13 +41,13 @@ void LOADERDECL TexCoord_Read_Dummy()
} }
template <typename T> template <typename T>
float TCScale(T val) float TCScale(T val, float scale)
{ {
return val * tcScale[tcIndex]; return val * scale;
} }
template <> template <>
float TCScale(float val) float TCScale(float val, float scale)
{ {
return val; return val;
} }
@ -55,8 +55,10 @@ float TCScale(float val)
template <typename T, int N> template <typename T, int N>
void LOADERDECL TexCoord_ReadDirect() void LOADERDECL TexCoord_ReadDirect()
{ {
auto const scale = tcScale[tcIndex];
for (int i = 0; i != N; ++i) for (int i = 0; i != N; ++i)
DataWrite(TCScale(DataRead<T>())); DataWrite(TCScale(DataRead<T>(), scale));
LOG_TEX<N>(); LOG_TEX<N>();
@ -71,9 +73,10 @@ void LOADERDECL TexCoord_ReadIndex()
auto const index = DataRead<I>(); auto const index = DataRead<I>();
auto const data = reinterpret_cast<const T*>(cached_arraybases[ARRAY_TEXCOORD0 + tcIndex] auto const data = reinterpret_cast<const T*>(cached_arraybases[ARRAY_TEXCOORD0 + tcIndex]
+ (index * arraystrides[ARRAY_TEXCOORD0 + tcIndex])); + (index * arraystrides[ARRAY_TEXCOORD0 + tcIndex]));
auto const scale = tcScale[tcIndex];
for (int i = 0; i != N; ++i) for (int i = 0; i != N; ++i)
DataWrite(TCScale(Common::FromBigEndian(data[i]))); DataWrite(TCScale(Common::FromBigEndian(data[i]), scale));
LOG_TEX<N>(); LOG_TEX<N>();
++tcIndex; ++tcIndex;