From e9d147349bd90b7b2ee6d0f9f5825de28c3a018e Mon Sep 17 00:00:00 2001 From: Subv Date: Mon, 2 Jul 2018 09:42:48 -0500 Subject: GPU: Allow GpuToCpuAddress to return boost::none for unmapped addresses. --- src/video_core/memory_manager.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/video_core/memory_manager.cpp b/src/video_core/memory_manager.cpp index 5cefce9fc..2f814a184 100644 --- a/src/video_core/memory_manager.cpp +++ b/src/video_core/memory_manager.cpp @@ -100,9 +100,9 @@ boost::optional MemoryManager::FindFreeBlock(u64 size, u64 align) { boost::optional MemoryManager::GpuToCpuAddress(GPUVAddr gpu_addr) { VAddr base_addr = PageSlot(gpu_addr); - ASSERT(base_addr != static_cast(PageStatus::Unmapped)); - if (base_addr == static_cast(PageStatus::Allocated)) { + if (base_addr == static_cast(PageStatus::Allocated) || + base_addr == static_cast(PageStatus::Unmapped)) { return {}; } -- cgit v1.2.3 From 80c5e8ae99255fd2871e9500a5b26e5b5cb6b167 Mon Sep 17 00:00:00 2001 From: Subv Date: Mon, 2 Jul 2018 09:43:38 -0500 Subject: GPU: Ignore disabled textures and textures with an invalid address. --- src/video_core/renderer_opengl/gl_rasterizer.cpp | 6 +++++- src/video_core/renderer_opengl/gl_rasterizer_cache.cpp | 5 +++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp index 62ee45a36..45560fbee 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp @@ -636,7 +636,11 @@ u32 RasterizerOpenGL::SetupTextures(Maxwell::ShaderStage stage, GLuint program, glProgramUniform1i(program, uniform, current_bindpoint); 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); Surface surface = res_cache.GetTextureSurface(texture); diff --git a/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp b/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp index 63f5999ea..44054f338 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp @@ -454,6 +454,11 @@ Surface RasterizerCacheOpenGL::GetSurface(const SurfaceParams& params) { 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 const auto& surface_key{SurfaceKey::Create(params)}; const auto& search{surface_cache.find(surface_key)}; -- cgit v1.2.3