mirror of
https://github.com/hrydgard/ppsspp.git
synced 2026-07-11 01:25:07 +02:00
Build and warning fixes
This commit is contained in:
+1
-1
@@ -56,7 +56,7 @@ static Event *eventPool = 0;
|
||||
// as we can already reach that structure through a register.
|
||||
int slicelength;
|
||||
|
||||
static alignas(16) s64 globalTimer;
|
||||
alignas(16) static s64 globalTimer;
|
||||
static s64 idledCycles;
|
||||
static s64 lastGlobalTimeTicks;
|
||||
static s64 lastGlobalTimeUs;
|
||||
|
||||
@@ -38,7 +38,6 @@ static std::vector<ShaderInfo> shaderInfo;
|
||||
static std::vector<TextureShaderInfo> textureShaderInfo;
|
||||
|
||||
static Draw::GPUVendor VendorFromString(const std::string &vendor) {
|
||||
Draw::GPUVendor::VENDOR_UNKNOWN;
|
||||
// TODO: This should probably be a function somewhere.
|
||||
if (vendor == "ARM") {
|
||||
return Draw::GPUVendor::VENDOR_ARM;
|
||||
|
||||
@@ -1669,6 +1669,8 @@ bool GetCurrentDrawAsDebugVertices(DrawEngineCommon *drawEngine, GECommand cmd,
|
||||
case GE_PRIM_TRIANGLE_STRIP:
|
||||
prim = GE_PRIM_TRIANGLES;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
int generatedIndices = indexGen.VertexCount();
|
||||
|
||||
@@ -873,7 +873,7 @@ void TextureCacheCommon::Decimate(TexCacheEntry *exceptThisOne, bool forcePressu
|
||||
}
|
||||
}
|
||||
|
||||
VERBOSE_LOG(Log::G3D, "Decimated texture cache, saved %d estimated bytes - now %d bytes", had - cacheSizeEstimate, cacheSizeEstimate);
|
||||
VERBOSE_LOG(Log::G3D, "Decimated texture cache, saved %d estimated bytes - now %d bytes", (int)(had - cacheSizeEstimate), (int)cacheSizeEstimate);
|
||||
}
|
||||
|
||||
s64 secondCacheSizeEstimate = SecondCacheSizeEstimate();
|
||||
@@ -896,7 +896,7 @@ void TextureCacheCommon::Decimate(TexCacheEntry *exceptThisOne, bool forcePressu
|
||||
}
|
||||
}
|
||||
|
||||
VERBOSE_LOG(Log::G3D, "Decimated second texture cache, saved %d estimated bytes - now %d bytes", had - secondCacheSizeEstimate, secondCacheSizeEstimate);
|
||||
VERBOSE_LOG(Log::G3D, "Decimated second texture cache, saved %d estimated bytes - now %d bytes", (int)(had - secondCacheSizeEstimate), (int)secondCacheSizeEstimate);
|
||||
}
|
||||
|
||||
// Decimate known videos.
|
||||
|
||||
@@ -77,5 +77,3 @@ private:
|
||||
|
||||
enum { INVALID_TEX = -1 };
|
||||
};
|
||||
|
||||
static Draw::DataFormat getClutDestFormat(GEPaletteFormat format);
|
||||
|
||||
Reference in New Issue
Block a user