citra-emu
/
citra-canary
Archived
1
0
Fork 0
Code

GetFramebufferSurfaces: Remove an assert that is no longer correct

This commit is contained in:
Phantom 2018-01-29 00:50:47 +01:00 committed by James Rowe
parent 88f6521511
commit db21154142
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -971,6 +971,8 @@ Surface RasterizerCacheOpenGL::GetSurface(const SurfaceParams& params, ScaleMatc
// Use GetSurfaceSubRect instead // Use GetSurfaceSubRect instead
ASSERT(params.width == params.stride); ASSERT(params.width == params.stride);
ASSERT(!params.is_tiled || (params.width % 8 == 0 && params.height % 8 == 0));
// Check for an exact match in existing surfaces // Check for an exact match in existing surfaces
Surface surface = Surface surface =
FindMatch<MatchFlags::Exact | MatchFlags::Invalid>(surface_cache, params, match_res_scale); FindMatch<MatchFlags::Exact | MatchFlags::Invalid>(surface_cache, params, match_res_scale);
@ -1178,8 +1180,8 @@ SurfaceSurfaceRect_Tuple RasterizerCacheOpenGL::GetFramebufferSurfaces(
if (color_surface != nullptr && depth_surface != nullptr) { if (color_surface != nullptr && depth_surface != nullptr) {
fb_rect = color_rect; fb_rect = color_rect;
// Color and Depth surfaces must have the same dimensions and offsets // Color and Depth surfaces must have the same dimensions and offsets
if (color_rect.bottom != depth_rect.bottom || if (color_rect.bottom != depth_rect.bottom || color_rect.top != depth_rect.top ||
color_surface->height != depth_surface->height) { color_rect.left != depth_rect.left || color_rect.right != depth_rect.right) {
color_surface = GetSurface(color_params, ScaleMatch::Exact, false); color_surface = GetSurface(color_params, ScaleMatch::Exact, false);
depth_surface = GetSurface(depth_params, ScaleMatch::Exact, false); depth_surface = GetSurface(depth_params, ScaleMatch::Exact, false);
fb_rect = color_surface->GetScaledRect(); fb_rect = color_surface->GetScaledRect();
@ -1189,7 +1191,6 @@ SurfaceSurfaceRect_Tuple RasterizerCacheOpenGL::GetFramebufferSurfaces(
} else if (depth_surface != nullptr) { } else if (depth_surface != nullptr) {
fb_rect = depth_rect; fb_rect = depth_rect;
} }
ASSERT(!fb_rect.left && fb_rect.right == config.GetWidth() * resolution_scale_factor);
if (color_surface != nullptr) { if (color_surface != nullptr) {
ValidateSurface(color_surface, boost::icl::first(color_vp_interval), ValidateSurface(color_surface, boost::icl::first(color_vp_interval),