libretro/ppsspp
1
0
Fork 0
mirror of https://github.com/libretro/ppsspp.git synced 2024-12-02 22:26:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #8468 from unknownbrackets/minor

Browse Source 
Add a small assert and some warning fixes
This commit is contained in:
Henrik Rydgård 2016-01-21 09:40:32 +01:00
commit 24cad4cab5
2 changed files with 30 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Core/MIPS/ARM64/Arm64RegCache.cpp
View File

@ -682,6 +682,10 @@ void Arm64RegCache::FlushAll() {
}
void Arm64RegCache::SetImm(MIPSGPReg r, u64 immVal) {
if (r == MIPS_REG_HI) {
ERROR_LOG_REPORT(JIT, "Cannot set HI imm in Arm64RegCache");
return;
}
if (r == MIPS_REG_ZERO && immVal != 0) {
ERROR_LOG_REPORT(JIT, "Trying to set immediate %08x to r0 at %08x", immVal, compilerPC_);
return;

42
GPU/GLES/ShaderManager.cpp
View File

@ -965,17 +965,15 @@ struct CacheHeader {
};
void ShaderManager::LoadAndPrecompile(const std::string &filename) {
FILE *f = File::OpenCFile(filename, "rb");
if (!f) {
File::IOFile f(filename, "rb");
if (!f.IsOpen()) {
return;
}
CacheHeader header;
if (fread(&header, 1, sizeof(header), f) != sizeof(header)) {
fclose(f);
if (!f.ReadArray(&header, 1)) {
return;
}
if (header.magic != CACHE_HEADER_MAGIC || header.version != CACHE_VERSION || header.featureFlags != gstate_c.featureFlags) {
fclose(f);
return;
}
time_update();
@ -983,34 +981,46 @@ void ShaderManager::LoadAndPrecompile(const std::string &filename) {
for (int i = 0; i < header.numVertexShaders; i++) {
ShaderID id;
fread(&id, 1, sizeof(id), f);
if (!f.ReadArray(&id, 1)) {
ERROR_LOG(G3D, "Truncated shader cache file, aborting.");
return;
}
Shader *vs = CompileVertexShader(id);
if (vs->Failed()) {
// Give up on using the cache, just bail. We can't safely create the fallback shaders here
// without trying to deduce the vertType from the VSID.
ERROR_LOG(G3D, "Failed to compile a vertex shader loading from cache. Skipping rest of shader cache.");
delete vs;
fclose(f);
return;
}
vsCache_[id] = vs;
}
for (int i = 0; i < header.numFragmentShaders; i++) {
ShaderID id;
fread(&id, 1, sizeof(id), f);
if (!f.ReadArray(&id, 1)) {
ERROR_LOG(G3D, "Truncated shader cache file, aborting.");
return;
}
fsCache_[id] = CompileFragmentShader(id);
}
for (int i = 0; i < header.numLinkedPrograms; i++) {
ShaderID vsid, fsid;
fread(&vsid, 1, sizeof(vsid), f);
fread(&fsid, 1, sizeof(fsid), f);
Shader *vs = vsCache_[vsid];
Shader *fs = fsCache_[fsid];
LinkedShader *ls = new LinkedShader(vsid, vs, fsid, fs, vs->UseHWTransform());
LinkedShaderCacheEntry entry(vs, fs, ls);
linkedShaderCache_.push_back(entry);
if (!f.ReadArray(&vsid, 1)) {
ERROR_LOG(G3D, "Truncated shader cache file, aborting.");
return;
}
if (!f.ReadArray(&fsid, 1)) {
ERROR_LOG(G3D, "Truncated shader cache file, aborting.");
return;
}
VSCache::iterator vs = vsCache_.find(vsid);
FSCache::iterator fs = fsCache_.find(fsid);
if (vs != vsCache_.end() && fs != fsCache_.end()) {
LinkedShader *ls = new LinkedShader(vsid, vs->second, fsid, fs->second, vs->second->UseHWTransform());
LinkedShaderCacheEntry entry(vs->second, fs->second, ls);
linkedShaderCache_.push_back(entry);
}
}
fclose(f);
time_update();
double end = time_now_d();