From 91fad7010ba7595de49b05602f287261b2727a10 Mon Sep 17 00:00:00 2001
From: James Rowe <jroweboy@gmail.com>
Date: Wed, 13 Dec 2017 10:22:29 -0700
Subject: [PATCH] Fix compilation on mac and linux

---
 .../renderer_opengl/gl_rasterizer_cache.cpp          | 12 ++++++------
 src/video_core/renderer_opengl/gl_rasterizer_cache.h |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp b/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp
index a7cb34b70..e6c290293 100644
--- a/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp
+++ b/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp
@@ -1022,7 +1022,7 @@ SurfaceRect_Tuple RasterizerCacheOpenGL::GetSurfaceSubRect(const SurfaceParams&
                                                            ScaleMatch match_res_scale,
                                                            bool load_if_create) {
     if (params.addr == 0 || params.height * params.width == 0) {
-        return {nullptr, {}};
+        return std::make_tuple(nullptr, MathUtil::Rectangle<u32>{});
     }
 
     // Attempt to find encompassing surface
@@ -1082,7 +1082,7 @@ SurfaceRect_Tuple RasterizerCacheOpenGL::GetSurfaceSubRect(const SurfaceParams&
         ValidateSurface(surface, params.addr, params.size);
     }
 
-    return {surface, surface->GetScaledSubRect(params)};
+    return std::make_tuple(surface, surface->GetScaledSubRect(params));
 }
 
 Surface RasterizerCacheOpenGL::GetTextureSurface(
@@ -1189,7 +1189,7 @@ SurfaceSurfaceRect_Tuple RasterizerCacheOpenGL::GetFramebufferSurfaces(
                         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) {
@@ -1235,7 +1235,7 @@ SurfaceRect_Tuple RasterizerCacheOpenGL::GetTexCopySurface(const SurfaceParams&
         rect = match_surface->GetScaledSubRect(match_subrect);
     }
 
-    return {match_surface, rect};
+    return std::make_tuple(match_surface, rect);
 }
 
 void RasterizerCacheOpenGL::DuplicateSurface(const Surface& src_surface,
@@ -1271,7 +1271,7 @@ void RasterizerCacheOpenGL::ValidateSurface(const Surface& surface, PAddr addr,
         return;
     }
 
-    const auto validate_regions = surface->invalid_regions.find(validate_interval);
+    auto validate_regions = surface->invalid_regions & validate_interval;
 
     for (;;) {
         const auto it = validate_regions.begin();
@@ -1295,7 +1295,7 @@ void RasterizerCacheOpenGL::ValidateSurface(const Surface& surface, PAddr addr,
         FlushRegion(params.addr, params.size);
         surface->LoadGLBuffer(params.addr, params.end);
         surface->UploadGLTexture(surface->GetSubRect(params));
-        validate_regions.erase(interval)
+        validate_regions.erase(interval);
     }
 }
 
diff --git a/src/video_core/renderer_opengl/gl_rasterizer_cache.h b/src/video_core/renderer_opengl/gl_rasterizer_cache.h
index b2faa3916..e4db19af7 100644
--- a/src/video_core/renderer_opengl/gl_rasterizer_cache.h
+++ b/src/video_core/renderer_opengl/gl_rasterizer_cache.h
@@ -111,7 +111,7 @@ struct SurfaceParams {
             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)];
     }
     unsigned int GetFormatBpp() const {