diff --git a/GPU/Common/VertexDecoderArm64.cpp b/GPU/Common/VertexDecoderArm64.cpp index e644af9ffb..aa345a160b 100644 --- a/GPU/Common/VertexDecoderArm64.cpp +++ b/GPU/Common/VertexDecoderArm64.cpp @@ -51,8 +51,6 @@ static const ARM64Reg fpScratchReg = S4; static const ARM64Reg fpScratchReg2 = S5; static const ARM64Reg fpScratchReg3 = S6; static const ARM64Reg fpScratchReg4 = S7; -static const ARM64Reg fpUVscaleReg = D0; -static const ARM64Reg fpUVoffsetReg = D1; static const ARM64Reg neonScratchRegD = D2; static const ARM64Reg neonScratchRegQ = Q2; @@ -278,11 +276,9 @@ bool VertexDecoderJitCache::CompileStep(const VertexDecoder &dec, int step) { void VertexDecoderJitCache::Jit_ApplyWeights() { // We construct a matrix in Q4-Q7 - // We can use Q1 as temp. if (dec_->nweights >= 4) { MOVP2R(scratchReg64, bones + 16 * 4); } - for (int i = 0; i < dec_->nweights; i++) { switch (i) { case 0: diff --git a/UI/BackgroundAudio.cpp b/UI/BackgroundAudio.cpp index 558e5901f5..cccb9ba7de 100644 --- a/UI/BackgroundAudio.cpp +++ b/UI/BackgroundAudio.cpp @@ -16,8 +16,7 @@ class AT3PlusReader { public: AT3PlusReader(const std::string &data) - : data_(data), - file_((const uint8_t *)&data[0], + : file_((const uint8_t *)&data[0], (int32_t)data.size()), raw_data_(0), raw_data_size_(0), @@ -150,7 +149,6 @@ public: } private: - const std::string &data_; ChunkFile file_; uint8_t *raw_data_; int raw_data_size_; diff --git a/native b/native index 6eeecbc5af..e9414c238d 160000 --- a/native +++ b/native @@ -1 +1 @@ -Subproject commit 6eeecbc5af0ca37e42142f794fd11d4d98f21c3c +Subproject commit e9414c238d10a1e0e0216e4cb1042611ef15f72b