From fa59a7b4d8403c0d277b189c880469cf8113e386 Mon Sep 17 00:00:00 2001
From: ReinUsesLisp <reinuseslisp@airmail.cc>
Date: Wed, 24 Apr 2019 18:47:59 -0300
Subject: gl_texture_cache: Implement fermi copies

---
 src/video_core/renderer_opengl/utils.h | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

(limited to 'src/video_core/renderer_opengl/utils.h')

diff --git a/src/video_core/renderer_opengl/utils.h b/src/video_core/renderer_opengl/utils.h
index b3e9fc499..e7726d14e 100644
--- a/src/video_core/renderer_opengl/utils.h
+++ b/src/video_core/renderer_opengl/utils.h
@@ -8,9 +8,13 @@
 #include <vector>
 #include <glad/glad.h>
 #include "common/common_types.h"
+#include "common/math_util.h"
+#include "video_core/renderer_opengl/gl_resource_manager.h"
 
 namespace OpenGL {
 
+class CachedSurfaceView;
+
 class BindBuffersRangePushBuffer {
 public:
     BindBuffersRangePushBuffer(GLenum target);
@@ -30,6 +34,19 @@ private:
     std::vector<GLsizeiptr> sizes;
 };
 
+class SurfaceBlitter {
+public:
+    explicit SurfaceBlitter();
+    ~SurfaceBlitter();
+
+    void Blit(CachedSurfaceView* src, CachedSurfaceView* dst,
+              const Common::Rectangle<u32>& src_rect, const Common::Rectangle<u32>& dst_rect) const;
+
+private:
+    OGLFramebuffer src_framebuffer;
+    OGLFramebuffer dst_framebuffer;
+};
+
 void LabelGLObject(GLenum identifier, GLuint handle, VAddr addr, std::string_view extra_info = {});
 
 } // namespace OpenGL
\ No newline at end of file
-- 
cgit v1.2.3


From bc930754cc9437ddd86e7d246b3eb4302540896a Mon Sep 17 00:00:00 2001
From: Fernando Sahmkow <fsahmkow27@gmail.com>
Date: Tue, 7 May 2019 10:57:16 -0400
Subject: Implement Texture Cache V2

---
 src/video_core/renderer_opengl/utils.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/video_core/renderer_opengl/utils.h')

diff --git a/src/video_core/renderer_opengl/utils.h b/src/video_core/renderer_opengl/utils.h
index e7726d14e..8977d2383 100644
--- a/src/video_core/renderer_opengl/utils.h
+++ b/src/video_core/renderer_opengl/utils.h
@@ -39,8 +39,8 @@ public:
     explicit SurfaceBlitter();
     ~SurfaceBlitter();
 
-    void Blit(CachedSurfaceView* src, CachedSurfaceView* dst,
-              const Common::Rectangle<u32>& src_rect, const Common::Rectangle<u32>& dst_rect) const;
+    void Blit(View src, View dst, const Common::Rectangle<u32>& src_rect,
+              const Common::Rectangle<u32>& dst_rect) const;
 
 private:
     OGLFramebuffer src_framebuffer;
@@ -49,4 +49,4 @@ private:
 
 void LabelGLObject(GLenum identifier, GLuint handle, VAddr addr, std::string_view extra_info = {});
 
-} // namespace OpenGL
\ No newline at end of file
+} // namespace OpenGL
-- 
cgit v1.2.3


From 324e470879e63423844a687f7d675a0536006f07 Mon Sep 17 00:00:00 2001
From: Fernando Sahmkow <fsahmkow27@gmail.com>
Date: Tue, 7 May 2019 23:13:05 -0400
Subject: Texture Cache: Implement Blitting and Fermi Copies

---
 src/video_core/renderer_opengl/utils.h | 13 -------------
 1 file changed, 13 deletions(-)

(limited to 'src/video_core/renderer_opengl/utils.h')

diff --git a/src/video_core/renderer_opengl/utils.h b/src/video_core/renderer_opengl/utils.h
index 8977d2383..77e8d53ba 100644
--- a/src/video_core/renderer_opengl/utils.h
+++ b/src/video_core/renderer_opengl/utils.h
@@ -34,19 +34,6 @@ private:
     std::vector<GLsizeiptr> sizes;
 };
 
-class SurfaceBlitter {
-public:
-    explicit SurfaceBlitter();
-    ~SurfaceBlitter();
-
-    void Blit(View src, View dst, const Common::Rectangle<u32>& src_rect,
-              const Common::Rectangle<u32>& dst_rect) const;
-
-private:
-    OGLFramebuffer src_framebuffer;
-    OGLFramebuffer dst_framebuffer;
-};
-
 void LabelGLObject(GLenum identifier, GLuint handle, VAddr addr, std::string_view extra_info = {});
 
 } // namespace OpenGL
-- 
cgit v1.2.3


From 4504302abcccfe5116bb5fed55e62472dc983ec5 Mon Sep 17 00:00:00 2001
From: ReinUsesLisp <reinuseslisp@airmail.cc>
Date: Mon, 24 Jun 2019 02:02:35 -0300
Subject: renderer_opengl/utils: Remove unused includes and unused forward
 declaration

---
 src/video_core/renderer_opengl/utils.h | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'src/video_core/renderer_opengl/utils.h')

diff --git a/src/video_core/renderer_opengl/utils.h b/src/video_core/renderer_opengl/utils.h
index 77e8d53ba..4a752f3b4 100644
--- a/src/video_core/renderer_opengl/utils.h
+++ b/src/video_core/renderer_opengl/utils.h
@@ -8,13 +8,9 @@
 #include <vector>
 #include <glad/glad.h>
 #include "common/common_types.h"
-#include "common/math_util.h"
-#include "video_core/renderer_opengl/gl_resource_manager.h"
 
 namespace OpenGL {
 
-class CachedSurfaceView;
-
 class BindBuffersRangePushBuffer {
 public:
     BindBuffersRangePushBuffer(GLenum target);
-- 
cgit v1.2.3