Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-11-23 13:30:02 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Common: Fix some unused ident and case warnings.

Browse Source
This commit is contained in:
Unknown W. Brackets 2019-06-22 13:01:47 -07:00
parent 688b899b6a
commit 732d344328
4 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Core/MIPS/MIPSIntVFPU.cpp
View File

@ -874,6 +874,10 @@ namespace MIPSInt
d[0] = ShrinkToHalf(s[0]) | ((u32)ShrinkToHalf(s[1]) << 16);
d[1] = ShrinkToHalf(s[2]) | ((u32)ShrinkToHalf(s[3]) << 16);
break;
default:
ERROR_LOG_REPORT(CPU, "vf2h with invalid elements");
break;
}
ApplyPrefixD(reinterpret_cast<float *>(d), outsize);
WriteVector(reinterpret_cast<float *>(d), outsize, vd);
@ -939,7 +943,7 @@ namespace MIPSInt
break;
default:
ERROR_LOG_REPORT(CPU, "vus2i with more than 2 elements.");
ERROR_LOG_REPORT(CPU, "vus2i with more than 2 elements");
break;
}
break;
@ -963,7 +967,7 @@ namespace MIPSInt
break;
default:
ERROR_LOG_REPORT(CPU, "vs2i with more than 2 elements.");
ERROR_LOG_REPORT(CPU, "vs2i with more than 2 elements");
break;
}
break;
@ -2081,6 +2085,10 @@ namespace MIPSInt
// t swizzles invalid so the multiply is always zero.
d[0] = 0;
break;
default:
ERROR_LOG_REPORT(CPU, "vcrsp/vqmul with invalid elements");
break;
}
// D prefix applies to the last element only (mask and sat) for pair and larger.

14
Core/MIPS/MIPSVFPUUtils.h
View File

@ -121,27 +121,27 @@ enum MatrixSize {
M_Invalid = -1
};
static u32 VFPU_SWIZZLE(int x, int y, int z, int w) {
inline u32 VFPU_SWIZZLE(int x, int y, int z, int w) {
return (x << 0) | (y << 2) | (z << 4) | (w << 6);
}
static u32 VFPU_MASK(int x, int y, int z, int w) {
inline u32 VFPU_MASK(int x, int y, int z, int w) {
return (x << 0) | (y << 1) | (z << 2) | (w << 3);
}
static u32 VFPU_ANY_SWIZZLE() {
inline u32 VFPU_ANY_SWIZZLE() {
return 0x000000FF;
}
static u32 VFPU_ABS(int x, int y, int z, int w) {
inline u32 VFPU_ABS(int x, int y, int z, int w) {
return VFPU_MASK(x, y, z, w) << 8;
}
static u32 VFPU_CONST(int x, int y, int z, int w) {
inline u32 VFPU_CONST(int x, int y, int z, int w) {
return VFPU_MASK(x, y, z, w) << 12;
}
static u32 VFPU_NEGATE(int x, int y, int z, int w) {
inline u32 VFPU_NEGATE(int x, int y, int z, int w) {
return VFPU_MASK(x, y, z, w) << 16;
}
@ -157,7 +157,7 @@ enum class VFPUConst {
SIXTH,
};
static u32 VFPU_MAKE_CONSTANTS(VFPUConst x, VFPUConst y, VFPUConst z, VFPUConst w) {
inline u32 VFPU_MAKE_CONSTANTS(VFPUConst x, VFPUConst y, VFPUConst z, VFPUConst w) {
u32 result = 0;
if (x != VFPUConst::NONE) {
// This sets the constant flag and the swizzle/abs flags for the right constant.

1
GPU/GLES/DepalettizeShaderGLES.h
View File

@ -64,7 +64,6 @@ private:
GLRenderManager *render_;
bool useGL3_;
bool vertexShaderFailed_ = false;
GLRShader *vertexShader_ = nullptr;
std::map<u32, DepalShader *> cache_;
std::map<u32, DepalTexture *> texCache_;

2
UI/DiscordIntegration.cpp
View File

@ -31,10 +31,12 @@ Discord g_Discord;
static const char *ppsspp_app_id = "423397985041383434";
#ifdef ENABLE_DISCORD
// No context argument? What?
static void handleDiscordError(int errCode, const char *message) {
ERROR_LOG(SYSTEM, "Discord error code %d: '%s'", errCode, message);
}
#endif
Discord::~Discord() {
assert(!initialized_);