OpenPunk/citra
1
0
Fork 0
mirror of https://github.com/citra-emu/citra.git synced 2024-11-25 10:30:15 +00:00
Code Issues Projects Releases Wiki Activity

renderer_opengl: check if surface_interval is empty

Browse Source
This commit is contained in:
bogang233 2016-09-15 15:08:00 +08:00
parent 81bb315839
commit 23d3a52abe
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -232,6 +232,7 @@ CachedSurface* RasterizerCacheOpenGL::GetSurface(const CachedSurface& params, bo
float exact_surface_goodness = -1.f; float exact_surface_goodness = -1.f;
auto surface_interval = boost::icl::interval<PAddr>::right_open(params.addr, params.addr + params_size); auto surface_interval = boost::icl::interval<PAddr>::right_open(params.addr, params.addr + params_size);
if (boost::icl::is_empty(surface_interval)) return nullptr;
auto range = surface_cache.equal_range(surface_interval); auto range = surface_cache.equal_range(surface_interval);
for (auto it = range.first; it != range.second; ++it) { for (auto it = range.first; it != range.second; ++it) {
for (auto it2 = it->second.begin(); it2 != it->second.end(); ++it2) { for (auto it2 = it->second.begin(); it2 != it->second.end(); ++it2) {
@ -406,6 +407,7 @@ CachedSurface* RasterizerCacheOpenGL::GetSurfaceRect(const CachedSurface& params
float subrect_surface_goodness = -1.f; float subrect_surface_goodness = -1.f;
auto surface_interval = boost::icl::interval<PAddr>::right_open(params.addr, params.addr + params_size); auto surface_interval = boost::icl::interval<PAddr>::right_open(params.addr, params.addr + params_size);
if (boost::icl::is_empty(surface_interval)) return nullptr;
auto cache_upper_bound = surface_cache.upper_bound(surface_interval); auto cache_upper_bound = surface_cache.upper_bound(surface_interval);
for (auto it = surface_cache.lower_bound(surface_interval); it != cache_upper_bound; ++it) { for (auto it = surface_cache.lower_bound(surface_interval); it != cache_upper_bound; ++it) {
for (auto it2 = it->second.begin(); it2 != it->second.end(); ++it2) { for (auto it2 = it->second.begin(); it2 != it->second.end(); ++it2) {
@ -565,6 +567,7 @@ std::tuple<CachedSurface*, CachedSurface*, MathUtil::Rectangle<int>> RasterizerC
CachedSurface* RasterizerCacheOpenGL::TryGetFillSurface(const GPU::Regs::MemoryFillConfig& config) { CachedSurface* RasterizerCacheOpenGL::TryGetFillSurface(const GPU::Regs::MemoryFillConfig& config) {
auto surface_interval = boost::icl::interval<PAddr>::right_open(config.GetStartAddress(), config.GetEndAddress()); auto surface_interval = boost::icl::interval<PAddr>::right_open(config.GetStartAddress(), config.GetEndAddress());
if (boost::icl::is_empty(surface_interval)) return nullptr;
auto range = surface_cache.equal_range(surface_interval); auto range = surface_cache.equal_range(surface_interval);
for (auto it = range.first; it != range.second; ++it) { for (auto it = range.first; it != range.second; ++it) {
for (auto it2 = it->second.begin(); it2 != it->second.end(); ++it2) { for (auto it2 = it->second.begin(); it2 != it->second.end(); ++it2) {
@ -689,6 +692,7 @@ void RasterizerCacheOpenGL::FlushRegion(PAddr addr, u32 size, const CachedSurfac
std::unordered_set<std::shared_ptr<CachedSurface>> touching_surfaces; std::unordered_set<std::shared_ptr<CachedSurface>> touching_surfaces;
auto surface_interval = boost::icl::interval<PAddr>::right_open(addr, addr + size); auto surface_interval = boost::icl::interval<PAddr>::right_open(addr, addr + size);
if (boost::icl::is_empty(surface_interval)) return;
auto cache_upper_bound = surface_cache.upper_bound(surface_interval); auto cache_upper_bound = surface_cache.upper_bound(surface_interval);
for (auto it = surface_cache.lower_bound(surface_interval); it != cache_upper_bound; ++it) { for (auto it = surface_cache.lower_bound(surface_interval); it != cache_upper_bound; ++it) {
std::copy_if(it->second.begin(), it->second.end(), std::inserter(touching_surfaces, touching_surfaces.end()), std::copy_if(it->second.begin(), it->second.end(), std::inserter(touching_surfaces, touching_surfaces.end()),