yuzu-emu
/
yuzu
Archived
1
0
Fork 0
Code

GPU: Ignore disabled textures and textures with an invalid address.

This commit is contained in:
Subv 2018-07-02 09:43:38 -05:00
parent e9d147349b
commit 80c5e8ae99
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/video_core/renderer_opengl/gl_rasterizer.cpp
View File

@ -636,7 +636,11 @@ u32 RasterizerOpenGL::SetupTextures(Maxwell::ShaderStage stage, GLuint program,
glProgramUniform1i(program, uniform, current_bindpoint); glProgramUniform1i(program, uniform, current_bindpoint);
const auto texture = maxwell3d.GetStageTexture(entry.GetStage(), entry.GetOffset()); const auto texture = maxwell3d.GetStageTexture(entry.GetStage(), entry.GetOffset());
ASSERT(texture.enabled);
if (!texture.enabled) {
state.texture_units[current_bindpoint].texture_2d = 0;
continue;
}
texture_samplers[current_bindpoint].SyncWithConfig(texture.tsc); texture_samplers[current_bindpoint].SyncWithConfig(texture.tsc);
Surface surface = res_cache.GetTextureSurface(texture); Surface surface = res_cache.GetTextureSurface(texture);

5
src/video_core/renderer_opengl/gl_rasterizer_cache.cpp
View File

@ -454,6 +454,11 @@ Surface RasterizerCacheOpenGL::GetSurface(const SurfaceParams& params) {
return {}; return {};
} }
const auto& gpu = Core::System::GetInstance().GPU();
// Don't try to create any entries in the cache if the address of the texture is invalid.
if (gpu.memory_manager->GpuToCpuAddress(params.addr) == boost::none)
return {};
// Check for an exact match in existing surfaces // Check for an exact match in existing surfaces
const auto& surface_key{SurfaceKey::Create(params)}; const auto& surface_key{SurfaceKey::Create(params)};
const auto& search{surface_cache.find(surface_key)}; const auto& search{surface_cache.find(surface_key)};