From b5b304cff2e9489816b44d539415970c4aa73d0b Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 21 Sep 2015 01:16:21 -0400 Subject: VertexShaderManager: Get rid of float pointer casts --- Source/Core/VideoCommon/VertexShaderManager.cpp | 56 +++++++++++++------------ 1 file changed, 30 insertions(+), 26 deletions(-) (limited to 'Source/Core/VideoCommon/VertexShaderManager.cpp') diff --git a/Source/Core/VideoCommon/VertexShaderManager.cpp b/Source/Core/VideoCommon/VertexShaderManager.cpp index 93d248938b..9a828febb0 100644 --- a/Source/Core/VideoCommon/VertexShaderManager.cpp +++ b/Source/Core/VideoCommon/VertexShaderManager.cpp @@ -4,9 +4,11 @@ #include #include +#include #include #include "Common/BitSet.h" +#include "Common/CommonFuncs.h" #include "Common/CommonTypes.h" #include "Common/MathUtil.h" #include "Core/ConfigManager.h" @@ -331,30 +333,30 @@ void VertexShaderManager::SetConstants() { bPosNormalMatrixChanged = false; - const float *pos = (const float *)xfmem.posMatrices + g_main_cp_state.matrix_index_a.PosNormalMtxIdx * 4; - const float *norm = (const float *)xfmem.normalMatrices + 3 * (g_main_cp_state.matrix_index_a.PosNormalMtxIdx & 31); + const float* pos = &xfmem.posMatrices[g_main_cp_state.matrix_index_a.PosNormalMtxIdx * 4]; + const float* norm = &xfmem.normalMatrices[3 * (g_main_cp_state.matrix_index_a.PosNormalMtxIdx & 31)]; - memcpy(constants.posnormalmatrix, pos, 3*16); - memcpy(constants.posnormalmatrix[3], norm, 12); - memcpy(constants.posnormalmatrix[4], norm+3, 12); - memcpy(constants.posnormalmatrix[5], norm+6, 12); + memcpy(constants.posnormalmatrix, pos, 3 * sizeof(float4)); + memcpy(constants.posnormalmatrix[3], norm, 3 * sizeof(u32)); + memcpy(constants.posnormalmatrix[4], norm + 3, 3 * sizeof(u32)); + memcpy(constants.posnormalmatrix[5], norm + 6, 3 * sizeof(u32)); dirty = true; } if (bTexMatricesChanged[0]) { bTexMatricesChanged[0] = false; - const float *fptrs[] = + const float* pos_matrix_ptrs[] = { - (const float *)&xfmem.posMatrices[g_main_cp_state.matrix_index_a.Tex0MtxIdx * 4], - (const float *)&xfmem.posMatrices[g_main_cp_state.matrix_index_a.Tex1MtxIdx * 4], - (const float *)&xfmem.posMatrices[g_main_cp_state.matrix_index_a.Tex2MtxIdx * 4], - (const float *)&xfmem.posMatrices[g_main_cp_state.matrix_index_a.Tex3MtxIdx * 4] + &xfmem.posMatrices[g_main_cp_state.matrix_index_a.Tex0MtxIdx * 4], + &xfmem.posMatrices[g_main_cp_state.matrix_index_a.Tex1MtxIdx * 4], + &xfmem.posMatrices[g_main_cp_state.matrix_index_a.Tex2MtxIdx * 4], + &xfmem.posMatrices[g_main_cp_state.matrix_index_a.Tex3MtxIdx * 4] }; - for (int i = 0; i < 4; ++i) + for (size_t i = 0; i < ArraySize(pos_matrix_ptrs); ++i) { - memcpy(constants.texmatrices[3 * i], fptrs[i], 3 * 16); + memcpy(constants.texmatrices[3 * i], pos_matrix_ptrs[i], 3 * sizeof(float4)); } dirty = true; } @@ -362,16 +364,16 @@ void VertexShaderManager::SetConstants() if (bTexMatricesChanged[1]) { bTexMatricesChanged[1] = false; - const float *fptrs[] = { - (const float *)&xfmem.posMatrices[g_main_cp_state.matrix_index_b.Tex4MtxIdx * 4], - (const float *)&xfmem.posMatrices[g_main_cp_state.matrix_index_b.Tex5MtxIdx * 4], - (const float *)&xfmem.posMatrices[g_main_cp_state.matrix_index_b.Tex6MtxIdx * 4], - (const float *)&xfmem.posMatrices[g_main_cp_state.matrix_index_b.Tex7MtxIdx * 4] + const float* pos_matrix_ptrs[] = { + &xfmem.posMatrices[g_main_cp_state.matrix_index_b.Tex4MtxIdx * 4], + &xfmem.posMatrices[g_main_cp_state.matrix_index_b.Tex5MtxIdx * 4], + &xfmem.posMatrices[g_main_cp_state.matrix_index_b.Tex6MtxIdx * 4], + &xfmem.posMatrices[g_main_cp_state.matrix_index_b.Tex7MtxIdx * 4] }; - for (int i = 0; i < 4; ++i) + for (size_t i = 0; i < ArraySize(pos_matrix_ptrs); ++i) { - memcpy(constants.texmatrices[3*i + 12], fptrs[i], 3*16); + memcpy(constants.texmatrices[3*i + 12], pos_matrix_ptrs[i], 3 * sizeof(float4)); } dirty = true; } @@ -732,16 +734,18 @@ void VertexShaderManager::ResetView() void VertexShaderManager::TransformToClipSpace(const float* data, float* out, u32 MtxIdx) { - const float* world_matrix = (const float*)xfmem.posMatrices + (MtxIdx & 0x3f) * 4; - // We use the projection matrix calculated by vertexShaderManager, because it + const float* world_matrix = &xfmem.posMatrices[(MtxIdx & 0x3f) * 4]; + + // We use the projection matrix calculated by VertexShaderManager, because it // includes any free look transformations. // Make sure VertexManager::SetConstants() has been called first. const float* proj_matrix = &g_fProjectionMatrix[0]; - float t[3]; - t[0] = data[0] * world_matrix[0] + data[1] * world_matrix[1] + data[2] * world_matrix[2] + world_matrix[3]; - t[1] = data[0] * world_matrix[4] + data[1] * world_matrix[5] + data[2] * world_matrix[6] + world_matrix[7]; - t[2] = data[0] * world_matrix[8] + data[1] * world_matrix[9] + data[2] * world_matrix[10] + world_matrix[11]; + const float t[3] = { + data[0] * world_matrix[0] + data[1] * world_matrix[1] + data[2] * world_matrix[2] + world_matrix[3], + data[0] * world_matrix[4] + data[1] * world_matrix[5] + data[2] * world_matrix[6] + world_matrix[7], + data[0] * world_matrix[8] + data[1] * world_matrix[9] + data[2] * world_matrix[10] + world_matrix[11] + }; out[0] = t[0] * proj_matrix[0] + t[1] * proj_matrix[1] + t[2] * proj_matrix[2] + proj_matrix[3]; out[1] = t[0] * proj_matrix[4] + t[1] * proj_matrix[5] + t[2] * proj_matrix[6] + proj_matrix[7]; -- cgit v1.2.3 From 419fed3952a25203df8c9d82197984f48032e808 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 21 Sep 2015 01:53:10 -0400 Subject: VertexShaderManager: Get rid of other magic constants --- Source/Core/VideoCommon/VertexShaderManager.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'Source/Core/VideoCommon/VertexShaderManager.cpp') diff --git a/Source/Core/VideoCommon/VertexShaderManager.cpp b/Source/Core/VideoCommon/VertexShaderManager.cpp index 9a828febb0..2e06a5f267 100644 --- a/Source/Core/VideoCommon/VertexShaderManager.cpp +++ b/Source/Core/VideoCommon/VertexShaderManager.cpp @@ -238,7 +238,7 @@ void VertexShaderManager::SetConstants() { int startn = nTransformMatricesChanged[0] / 4; int endn = (nTransformMatricesChanged[1] + 3) / 4; - memcpy(constants.transformmatrices[startn], &xfmem.posMatrices[startn * 4], (endn - startn) * 16); + memcpy(constants.transformmatrices[startn], &xfmem.posMatrices[startn * 4], (endn - startn) * sizeof(float4)); dirty = true; nTransformMatricesChanged[0] = nTransformMatricesChanged[1] = -1; } @@ -259,7 +259,7 @@ void VertexShaderManager::SetConstants() { int startn = nPostTransformMatricesChanged[0] / 4; int endn = (nPostTransformMatricesChanged[1] + 3) / 4; - memcpy(constants.posttransformmatrices[startn], &xfmem.postMatrices[startn * 4], (endn - startn) * 16); + memcpy(constants.posttransformmatrices[startn], &xfmem.postMatrices[startn * 4], (endn - startn) * sizeof(float4)); dirty = true; nPostTransformMatricesChanged[0] = nPostTransformMatricesChanged[1] = -1; } @@ -337,9 +337,9 @@ void VertexShaderManager::SetConstants() const float* norm = &xfmem.normalMatrices[3 * (g_main_cp_state.matrix_index_a.PosNormalMtxIdx & 31)]; memcpy(constants.posnormalmatrix, pos, 3 * sizeof(float4)); - memcpy(constants.posnormalmatrix[3], norm, 3 * sizeof(u32)); - memcpy(constants.posnormalmatrix[4], norm + 3, 3 * sizeof(u32)); - memcpy(constants.posnormalmatrix[5], norm + 6, 3 * sizeof(u32)); + memcpy(constants.posnormalmatrix[3], norm, 3 * sizeof(float)); + memcpy(constants.posnormalmatrix[4], norm + 3, 3 * sizeof(float)); + memcpy(constants.posnormalmatrix[5], norm + 6, 3 * sizeof(float)); dirty = true; } @@ -533,7 +533,7 @@ void VertexShaderManager::SetConstants() Matrix44::Set(mtxB, g_fProjectionMatrix); Matrix44::Multiply(mtxB, viewMtx, mtxA); // mtxA = projection x view Matrix44::Multiply(s_viewportCorrection, mtxA, mtxB); // mtxB = viewportCorrection x mtxA - memcpy(constants.projection, mtxB.data, 4*16); + memcpy(constants.projection, mtxB.data, 4 * sizeof(float4)); } else { @@ -542,7 +542,7 @@ void VertexShaderManager::SetConstants() Matrix44 correctedMtx; Matrix44::Multiply(s_viewportCorrection, projMtx, correctedMtx); - memcpy(constants.projection, correctedMtx.data, 4*16); + memcpy(constants.projection, correctedMtx.data, 4 * sizeof(float4)); } dirty = true; @@ -697,7 +697,7 @@ void VertexShaderManager::TranslateView(float x, float y, float z) Matrix33::Multiply(s_viewInvRotationMatrix, vector, result); - for (int i = 0; i < 3; i++) + for (size_t i = 0; i < ArraySize(result); i++) s_fViewTranslationVector[i] += result[i]; bProjectionChanged = true; -- cgit v1.2.3