From 7bfe100b0f39fc70d520d62f8551a52ef4f96d1a Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Wed, 25 Nov 2015 16:00:25 -0800 Subject: [PATCH] Fix some unused variable warnings. The CheckAlpha one looks like it will matter. --- Common/ColorConv.cpp | 2 -- Common/KeyMap.cpp | 6 +----- Core/HLE/sceUtility.cpp | 2 -- Core/MIPS/MIPSDis.cpp | 1 - GPU/Common/SoftwareTransformCommon.cpp | 1 - GPU/Common/SplineCommon.cpp | 4 +--- GPU/Common/TextureDecoder.cpp | 4 +--- GPU/Software/Rasterizer.cpp | 23 ++++++++++------------- 8 files changed, 13 insertions(+), 30 deletions(-) diff --git a/Common/ColorConv.cpp b/Common/ColorConv.cpp index 1a2a089325..d16a38bdf7 100644 --- a/Common/ColorConv.cpp +++ b/Common/ColorConv.cpp @@ -389,8 +389,6 @@ void ConvertRGBA5551ToRGBA8888(u32 *dst32, const u16 *src, const u32 numPixels) void ConvertRGBA4444ToRGBA8888(u32 *dst32, const u16 *src, const u32 numPixels) { #ifdef _M_SSE const __m128i mask4 = _mm_set1_epi16(0x000f); - const __m128i mask8 = _mm_set1_epi16(0x00ff); - const __m128i one = _mm_set1_epi16(0x0001); const __m128i *srcp = (const __m128i *)src; __m128i *dstp = (__m128i *)dst32; diff --git a/Common/KeyMap.cpp b/Common/KeyMap.cpp index 5a08f7c03f..3f088fbe66 100644 --- a/Common/KeyMap.cpp +++ b/Common/KeyMap.cpp @@ -791,8 +791,6 @@ bool KeyToPspButton(int deviceId, int key, std::vector *pspKeys) { // TODO: vector output bool KeyFromPspButton(int btn, std::vector *keys) { - int search_start_layer = 0; - for (auto iter = g_controllerMap.begin(); iter != g_controllerMap.end(); ++iter) { if (iter->first == btn) { for (auto iter2 = iter->second.begin(); iter2 != iter->second.end(); ++iter2) { @@ -800,7 +798,7 @@ bool KeyFromPspButton(int btn, std::vector *keys) { } } } - return false; + return keys->size() > 0; } bool AxisToPspButton(int deviceId, int axisId, int direction, std::vector *pspKeys) { @@ -809,8 +807,6 @@ bool AxisToPspButton(int deviceId, int axisId, int direction, std::vector * } bool AxisFromPspButton(int btn, int *deviceId, int *axisId, int *direction) { - int search_start_layer = 0; - for (auto iter = g_controllerMap.begin(); iter != g_controllerMap.end(); ++iter) { for (auto iter2 = iter->second.begin(); iter2 != iter->second.end(); ++iter2) { if (iter->first == btn && iter2->keyCode >= AXIS_BIND_NKCODE_START) { diff --git a/Core/HLE/sceUtility.cpp b/Core/HLE/sceUtility.cpp index ddbccadb63..80464b4778 100644 --- a/Core/HLE/sceUtility.cpp +++ b/Core/HLE/sceUtility.cpp @@ -61,8 +61,6 @@ const int SCE_ERROR_MODULE_BAD_ID = 0x80111101; const int SCE_ERROR_MODULE_ALREADY_LOADED = 0x80111102; const int SCE_ERROR_MODULE_NOT_LOADED = 0x80111103; const int SCE_ERROR_AV_MODULE_BAD_ID = 0x80110F01; -const u32 PSP_MODULE_NET_HTTP = 0x0105; -const u32 PSP_MODULE_NET_HTTPSTORAGE = 0x0108; int oldStatus = 100; //random value struct ModuleLoadInfo { diff --git a/Core/MIPS/MIPSDis.cpp b/Core/MIPS/MIPSDis.cpp index cb60a4ced7..9cc169e588 100644 --- a/Core/MIPS/MIPSDis.cpp +++ b/Core/MIPS/MIPSDis.cpp @@ -195,7 +195,6 @@ namespace MIPSDis } void Dis_ori(MIPSOpcode op, char *out) { - s32 simm = (s32)(s16)(op & 0xFFFF); u32 uimm = (u32)(u16)(op & 0xFFFF); int rt = _RT; int rs = _RS; diff --git a/GPU/Common/SoftwareTransformCommon.cpp b/GPU/Common/SoftwareTransformCommon.cpp index 47bc73c1d7..f35d86e8a7 100644 --- a/GPU/Common/SoftwareTransformCommon.cpp +++ b/GPU/Common/SoftwareTransformCommon.cpp @@ -101,7 +101,6 @@ static bool IsReallyAClear(const TransformedVertex *transformed, int numVerts) { int bufW = gstate_c.curRTWidth; int bufH = gstate_c.curRTHeight; - float prevX = 0.0f; for (int i = 1; i < numVerts; i++) { if (transformed[i].color0_32 != matchcolor || transformed[i].z != matchz) return false; diff --git a/GPU/Common/SplineCommon.cpp b/GPU/Common/SplineCommon.cpp index c080877d61..0f93e31791 100644 --- a/GPU/Common/SplineCommon.cpp +++ b/GPU/Common/SplineCommon.cpp @@ -441,7 +441,7 @@ static void SplinePatchFullQuality(u8 *&dest, u16 *indices, int &count, const Sp delete[] knot_v; // Hacky normal generation through central difference. - if (spatch.computeNormals && !origNrm) { + if (computeNormals && !origNrm) { #ifdef _M_SSE const __m128 facing = spatch.patchFacing ? _mm_set_ps1(-1.0f) : _mm_set_ps1(1.0f); #endif @@ -451,7 +451,6 @@ static void SplinePatchFullQuality(u8 *&dest, u16 *indices, int &count, const Sp Vec3f vc_pos = vertices[v * (patch_div_s + 1)].pos; for (int u = 0; u < patch_div_s + 1; u++) { - const int l = std::max(0, u - 1); const int t = std::max(0, v - 1); const int r = std::min(patch_div_s, u + 1); const int b = std::min(patch_div_t, v + 1); @@ -659,7 +658,6 @@ static void _BezierPatchHighQuality(u8 *&dest, u16 *&indices, int &count, int te for (int tile_u = 0; tile_u < tess_u + 1; ++tile_u) { float u = ((float)tile_u / (float)tess_u); float v = ((float)tile_v / (float)tess_v); - float bu = u; float bv = v; // TODO: Should be able to precompute the four curves per U, then just Bernstein per V. Will benefit large tesselation factors. diff --git a/GPU/Common/TextureDecoder.cpp b/GPU/Common/TextureDecoder.cpp index 53d3968c0e..87cba7ae1f 100644 --- a/GPU/Common/TextureDecoder.cpp +++ b/GPU/Common/TextureDecoder.cpp @@ -677,8 +677,6 @@ CheckAlphaResult CheckAlphaABGR1555Basic(const u32 *pixelData, int stride, int w #endif } - u32 hitZeroAlpha = 0; - const u32 *p = pixelData; const int w2 = (w + 1) / 2; const int stride2 = (stride + 1) / 2; @@ -755,7 +753,7 @@ CheckAlphaResult CheckAlphaRGBA5551Basic(const u32 *pixelData, int stride, int w return CHECKALPHA_ZERO; } - p += stride; + p += stride2; } return CHECKALPHA_FULL; diff --git a/GPU/Software/Rasterizer.cpp b/GPU/Software/Rasterizer.cpp index 7f2820b0ac..c33d765108 100644 --- a/GPU/Software/Rasterizer.cpp +++ b/GPU/Software/Rasterizer.cpp @@ -1338,24 +1338,21 @@ void DrawTriangle(const VertexData& v0, const VertexData& v1, const VertexData& int range = (maxY - minY) / 16 + 1; if (gstate.isModeClear()) { - if (range >= 24 && (maxX - minX) >= 24 * 16) - { - VertexData v[3] = { v0, v1, v2 }; - auto bound = [&](int a, int b) -> void {DrawTriangleSlice(v0, v1, v2, minX, minY, maxX, maxY, a, b); }; + if (range >= 24 && (maxX - minX) >= 24 * 16) { + auto bound = [&](int a, int b) -> void { + DrawTriangleSlice(v0, v1, v2, minX, minY, maxX, maxY, a, b); + }; GlobalThreadPool::Loop(bound, 0, range); - } - else - { + } else { DrawTriangleSlice(v0, v1, v2, minX, minY, maxX, maxY, 0, range); } } else { - if (range >= 24 && (maxX - minX) >= 24 * 16) - { - auto bound = [&](int a, int b) -> void {DrawTriangleSlice(v0, v1, v2, minX, minY, maxX, maxY, a, b); }; + if (range >= 24 && (maxX - minX) >= 24 * 16) { + auto bound = [&](int a, int b) -> void { + DrawTriangleSlice(v0, v1, v2, minX, minY, maxX, maxY, a, b); + }; GlobalThreadPool::Loop(bound, 0, range); - } - else - { + } else { DrawTriangleSlice(v0, v1, v2, minX, minY, maxX, maxY, 0, range); } }