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

Fix compilation on mac and linux

This commit is contained in:
James Rowe 2017-12-13 10:22:29 -07:00
parent 34ff77f5f7
commit 91fad7010b
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1022,7 +1022,7 @@ SurfaceRect_Tuple RasterizerCacheOpenGL::GetSurfaceSubRect(const SurfaceParams&
ScaleMatch match_res_scale, ScaleMatch match_res_scale,
bool load_if_create) { bool load_if_create) {
if (params.addr == 0 || params.height * params.width == 0) { if (params.addr == 0 || params.height * params.width == 0) {
return {nullptr, {}}; return std::make_tuple(nullptr, MathUtil::Rectangle<u32>{});
} }
// Attempt to find encompassing surface // Attempt to find encompassing surface
@ -1082,7 +1082,7 @@ SurfaceRect_Tuple RasterizerCacheOpenGL::GetSurfaceSubRect(const SurfaceParams&
ValidateSurface(surface, params.addr, params.size); ValidateSurface(surface, params.addr, params.size);
} }
return {surface, surface->GetScaledSubRect(params)}; return std::make_tuple(surface, surface->GetScaledSubRect(params));
} }
Surface RasterizerCacheOpenGL::GetTextureSurface( Surface RasterizerCacheOpenGL::GetTextureSurface(
@ -1189,7 +1189,7 @@ SurfaceSurfaceRect_Tuple RasterizerCacheOpenGL::GetFramebufferSurfaces(
boost::icl::length(depth_vp_interval)); boost::icl::length(depth_vp_interval));
} }
return {color_surface, depth_surface, fb_rect}; return std::make_tuple(color_surface, depth_surface, fb_rect);
} }
Surface RasterizerCacheOpenGL::GetFillSurface(const GPU::Regs::MemoryFillConfig& config) { Surface RasterizerCacheOpenGL::GetFillSurface(const GPU::Regs::MemoryFillConfig& config) {
@ -1235,7 +1235,7 @@ SurfaceRect_Tuple RasterizerCacheOpenGL::GetTexCopySurface(const SurfaceParams&
rect = match_surface->GetScaledSubRect(match_subrect); rect = match_surface->GetScaledSubRect(match_subrect);
} }
return {match_surface, rect}; return std::make_tuple(match_surface, rect);
} }
void RasterizerCacheOpenGL::DuplicateSurface(const Surface& src_surface, void RasterizerCacheOpenGL::DuplicateSurface(const Surface& src_surface,
@ -1271,7 +1271,7 @@ void RasterizerCacheOpenGL::ValidateSurface(const Surface& surface, PAddr addr,
return; return;
} }
const auto validate_regions = surface->invalid_regions.find(validate_interval); auto validate_regions = surface->invalid_regions & validate_interval;
for (;;) { for (;;) {
const auto it = validate_regions.begin(); const auto it = validate_regions.begin();
@ -1295,7 +1295,7 @@ void RasterizerCacheOpenGL::ValidateSurface(const Surface& surface, PAddr addr,
FlushRegion(params.addr, params.size); FlushRegion(params.addr, params.size);
surface->LoadGLBuffer(params.addr, params.end); surface->LoadGLBuffer(params.addr, params.end);
surface->UploadGLTexture(surface->GetSubRect(params)); surface->UploadGLTexture(surface->GetSubRect(params));
validate_regions.erase(interval) validate_regions.erase(interval);
} }
} }

2
src/video_core/renderer_opengl/gl_rasterizer_cache.h
View File

@ -111,7 +111,7 @@ struct SurfaceParams {
32, // D24S8 32, // D24S8
}; };
ASSERT(static_cast<size_t>(format) < bpp_table.size()); assert(static_cast<size_t>(format) < bpp_table.size());
return bpp_table[static_cast<size_t>(format)]; return bpp_table[static_cast<size_t>(format)];
} }
unsigned int GetFormatBpp() const { unsigned int GetFormatBpp() const {