diff options
| author | 2019-04-24 18:47:59 -0300 | |
|---|---|---|
| committer | 2019-06-20 21:36:11 -0300 | |
| commit | fa59a7b4d8403c0d277b189c880469cf8113e386 (patch) | |
| tree | 84f23efbbc588dffd1ab4f38c315cfc951b57c7d /src | |
| parent | texture_cache: Split texture cache into different files (diff) | |
| download | yuzu-fa59a7b4d8403c0d277b189c880469cf8113e386.tar.gz yuzu-fa59a7b4d8403c0d277b189c880469cf8113e386.tar.xz yuzu-fa59a7b4d8403c0d277b189c880469cf8113e386.zip | |
gl_texture_cache: Implement fermi copies
Diffstat (limited to 'src')
| -rw-r--r-- | src/video_core/renderer_opengl/gl_rasterizer.cpp | 5 | ||||
| -rw-r--r-- | src/video_core/renderer_opengl/gl_rasterizer.h | 1 | ||||
| -rw-r--r-- | src/video_core/renderer_opengl/gl_texture_cache.h | 1 | ||||
| -rw-r--r-- | src/video_core/renderer_opengl/utils.cpp | 83 | ||||
| -rw-r--r-- | src/video_core/renderer_opengl/utils.h | 17 |
5 files changed, 105 insertions, 2 deletions
diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp index af63365a4..027e9d293 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp | |||
| @@ -738,8 +738,9 @@ bool RasterizerOpenGL::AccelerateSurfaceCopy(const Tegra::Engines::Fermi2D::Regs | |||
| 738 | const Common::Rectangle<u32>& src_rect, | 738 | const Common::Rectangle<u32>& src_rect, |
| 739 | const Common::Rectangle<u32>& dst_rect) { | 739 | const Common::Rectangle<u32>& dst_rect) { |
| 740 | MICROPROFILE_SCOPE(OpenGL_Blits); | 740 | MICROPROFILE_SCOPE(OpenGL_Blits); |
| 741 | UNIMPLEMENTED(); | 741 | const auto src_surface{texture_cache.GetFermiSurface(src)}; |
| 742 | // texture_cache.FermiCopySurface(src, dst, src_rect, dst_rect); | 742 | const auto dst_surface{texture_cache.GetFermiSurface(dst)}; |
| 743 | blitter.Blit(src_surface, dst_surface, src_rect, dst_rect); | ||
| 743 | return true; | 744 | return true; |
| 744 | } | 745 | } |
| 745 | 746 | ||
diff --git a/src/video_core/renderer_opengl/gl_rasterizer.h b/src/video_core/renderer_opengl/gl_rasterizer.h index 921e9fc31..8e5009eeb 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.h +++ b/src/video_core/renderer_opengl/gl_rasterizer.h | |||
| @@ -202,6 +202,7 @@ private: | |||
| 202 | static constexpr std::size_t STREAM_BUFFER_SIZE = 128 * 1024 * 1024; | 202 | static constexpr std::size_t STREAM_BUFFER_SIZE = 128 * 1024 * 1024; |
| 203 | OGLBufferCache buffer_cache; | 203 | OGLBufferCache buffer_cache; |
| 204 | 204 | ||
| 205 | SurfaceBlitter blitter; | ||
| 205 | BindBuffersRangePushBuffer bind_ubo_pushbuffer{GL_UNIFORM_BUFFER}; | 206 | BindBuffersRangePushBuffer bind_ubo_pushbuffer{GL_UNIFORM_BUFFER}; |
| 206 | BindBuffersRangePushBuffer bind_ssbo_pushbuffer{GL_SHADER_STORAGE_BUFFER}; | 207 | BindBuffersRangePushBuffer bind_ssbo_pushbuffer{GL_SHADER_STORAGE_BUFFER}; |
| 207 | 208 | ||
diff --git a/src/video_core/renderer_opengl/gl_texture_cache.h b/src/video_core/renderer_opengl/gl_texture_cache.h index 3c15b37bd..b165187d9 100644 --- a/src/video_core/renderer_opengl/gl_texture_cache.h +++ b/src/video_core/renderer_opengl/gl_texture_cache.h | |||
| @@ -13,6 +13,7 @@ | |||
| 13 | 13 | ||
| 14 | #include "common/common_types.h" | 14 | #include "common/common_types.h" |
| 15 | #include "video_core/engines/shader_bytecode.h" | 15 | #include "video_core/engines/shader_bytecode.h" |
| 16 | #include "video_core/renderer_opengl/gl_resource_manager.h" | ||
| 16 | #include "video_core/texture_cache/texture_cache_contextless.h" | 17 | #include "video_core/texture_cache/texture_cache_contextless.h" |
| 17 | 18 | ||
| 18 | namespace OpenGL { | 19 | namespace OpenGL { |
diff --git a/src/video_core/renderer_opengl/utils.cpp b/src/video_core/renderer_opengl/utils.cpp index f23fc9f9d..d9be61604 100644 --- a/src/video_core/renderer_opengl/utils.cpp +++ b/src/video_core/renderer_opengl/utils.cpp | |||
| @@ -5,12 +5,21 @@ | |||
| 5 | #include <string> | 5 | #include <string> |
| 6 | #include <fmt/format.h> | 6 | #include <fmt/format.h> |
| 7 | #include <glad/glad.h> | 7 | #include <glad/glad.h> |
| 8 | |||
| 8 | #include "common/assert.h" | 9 | #include "common/assert.h" |
| 9 | #include "common/common_types.h" | 10 | #include "common/common_types.h" |
| 11 | #include "common/scope_exit.h" | ||
| 12 | #include "video_core/renderer_opengl/gl_state.h" | ||
| 13 | #include "video_core/renderer_opengl/gl_texture_cache.h" | ||
| 10 | #include "video_core/renderer_opengl/utils.h" | 14 | #include "video_core/renderer_opengl/utils.h" |
| 15 | #include "video_core/surface.h" | ||
| 11 | 16 | ||
| 12 | namespace OpenGL { | 17 | namespace OpenGL { |
| 13 | 18 | ||
| 19 | using Tegra::Shader::TextureType; | ||
| 20 | using Tegra::Texture::SwizzleSource; | ||
| 21 | using VideoCore::Surface::SurfaceTarget; | ||
| 22 | |||
| 14 | BindBuffersRangePushBuffer::BindBuffersRangePushBuffer(GLenum target) : target{target} {} | 23 | BindBuffersRangePushBuffer::BindBuffersRangePushBuffer(GLenum target) : target{target} {} |
| 15 | 24 | ||
| 16 | BindBuffersRangePushBuffer::~BindBuffersRangePushBuffer() = default; | 25 | BindBuffersRangePushBuffer::~BindBuffersRangePushBuffer() = default; |
| @@ -38,6 +47,80 @@ void BindBuffersRangePushBuffer::Bind() const { | |||
| 38 | sizes.data()); | 47 | sizes.data()); |
| 39 | } | 48 | } |
| 40 | 49 | ||
| 50 | SurfaceBlitter::SurfaceBlitter() { | ||
| 51 | src_framebuffer.Create(); | ||
| 52 | dst_framebuffer.Create(); | ||
| 53 | } | ||
| 54 | |||
| 55 | SurfaceBlitter::~SurfaceBlitter() = default; | ||
| 56 | |||
| 57 | void SurfaceBlitter::Blit(CachedSurfaceView* src, CachedSurfaceView* dst, | ||
| 58 | const Common::Rectangle<u32>& src_rect, | ||
| 59 | const Common::Rectangle<u32>& dst_rect) const { | ||
| 60 | const auto& src_params{src->GetSurfaceParams()}; | ||
| 61 | const auto& dst_params{dst->GetSurfaceParams()}; | ||
| 62 | |||
| 63 | OpenGLState prev_state{OpenGLState::GetCurState()}; | ||
| 64 | SCOPE_EXIT({ prev_state.Apply(); }); | ||
| 65 | |||
| 66 | OpenGLState state; | ||
| 67 | state.draw.read_framebuffer = src_framebuffer.handle; | ||
| 68 | state.draw.draw_framebuffer = dst_framebuffer.handle; | ||
| 69 | state.ApplyFramebufferState(); | ||
| 70 | |||
| 71 | u32 buffers{}; | ||
| 72 | |||
| 73 | UNIMPLEMENTED_IF(src_params.GetTarget() != SurfaceTarget::Texture2D); | ||
| 74 | UNIMPLEMENTED_IF(dst_params.GetTarget() != SurfaceTarget::Texture2D); | ||
| 75 | |||
| 76 | const auto GetTexture = [](CachedSurfaceView* view) { | ||
| 77 | return view->GetTexture(TextureType::Texture2D, false, SwizzleSource::R, SwizzleSource::G, | ||
| 78 | SwizzleSource::B, SwizzleSource::A); | ||
| 79 | }; | ||
| 80 | const GLuint src_texture{GetTexture(src)}; | ||
| 81 | const GLuint dst_texture{GetTexture(dst)}; | ||
| 82 | |||
| 83 | if (src_params.GetType() == SurfaceType::ColorTexture) { | ||
| 84 | glFramebufferTexture2D(GL_READ_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, | ||
| 85 | src_texture, 0); | ||
| 86 | glFramebufferTexture2D(GL_READ_FRAMEBUFFER, GL_DEPTH_STENCIL_ATTACHMENT, GL_TEXTURE_2D, 0, | ||
| 87 | 0); | ||
| 88 | |||
| 89 | glFramebufferTexture2D(GL_DRAW_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, | ||
| 90 | dst_texture, 0); | ||
| 91 | glFramebufferTexture2D(GL_DRAW_FRAMEBUFFER, GL_DEPTH_STENCIL_ATTACHMENT, GL_TEXTURE_2D, 0, | ||
| 92 | 0); | ||
| 93 | |||
| 94 | buffers = GL_COLOR_BUFFER_BIT; | ||
| 95 | } else if (src_params.GetType() == SurfaceType::Depth) { | ||
| 96 | glFramebufferTexture2D(GL_READ_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, 0, 0); | ||
| 97 | glFramebufferTexture2D(GL_READ_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_TEXTURE_2D, src_texture, | ||
| 98 | 0); | ||
| 99 | glFramebufferTexture2D(GL_READ_FRAMEBUFFER, GL_STENCIL_ATTACHMENT, GL_TEXTURE_2D, 0, 0); | ||
| 100 | |||
| 101 | glFramebufferTexture2D(GL_DRAW_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, 0, 0); | ||
| 102 | glFramebufferTexture2D(GL_DRAW_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_TEXTURE_2D, dst_texture, | ||
| 103 | 0); | ||
| 104 | glFramebufferTexture2D(GL_DRAW_FRAMEBUFFER, GL_STENCIL_ATTACHMENT, GL_TEXTURE_2D, 0, 0); | ||
| 105 | |||
| 106 | buffers = GL_DEPTH_BUFFER_BIT; | ||
| 107 | } else if (src_params.GetType() == SurfaceType::DepthStencil) { | ||
| 108 | glFramebufferTexture2D(GL_READ_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, 0, 0); | ||
| 109 | glFramebufferTexture2D(GL_READ_FRAMEBUFFER, GL_DEPTH_STENCIL_ATTACHMENT, GL_TEXTURE_2D, | ||
| 110 | src_texture, 0); | ||
| 111 | |||
| 112 | glFramebufferTexture2D(GL_DRAW_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, 0, 0); | ||
| 113 | glFramebufferTexture2D(GL_DRAW_FRAMEBUFFER, GL_DEPTH_STENCIL_ATTACHMENT, GL_TEXTURE_2D, | ||
| 114 | dst_texture, 0); | ||
| 115 | |||
| 116 | buffers = GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT; | ||
| 117 | } | ||
| 118 | |||
| 119 | glBlitFramebuffer(src_rect.left, src_rect.top, src_rect.right, src_rect.bottom, dst_rect.left, | ||
| 120 | dst_rect.top, dst_rect.right, dst_rect.bottom, buffers, | ||
| 121 | buffers == GL_COLOR_BUFFER_BIT ? GL_LINEAR : GL_NEAREST); | ||
| 122 | } | ||
| 123 | |||
| 41 | void LabelGLObject(GLenum identifier, GLuint handle, VAddr addr, std::string_view extra_info) { | 124 | void LabelGLObject(GLenum identifier, GLuint handle, VAddr addr, std::string_view extra_info) { |
| 42 | if (!GLAD_GL_KHR_debug) { | 125 | if (!GLAD_GL_KHR_debug) { |
| 43 | // We don't need to throw an error as this is just for debugging | 126 | // We don't need to throw an error as this is just for debugging |
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 @@ | |||
| 8 | #include <vector> | 8 | #include <vector> |
| 9 | #include <glad/glad.h> | 9 | #include <glad/glad.h> |
| 10 | #include "common/common_types.h" | 10 | #include "common/common_types.h" |
| 11 | #include "common/math_util.h" | ||
| 12 | #include "video_core/renderer_opengl/gl_resource_manager.h" | ||
| 11 | 13 | ||
| 12 | namespace OpenGL { | 14 | namespace OpenGL { |
| 13 | 15 | ||
| 16 | class CachedSurfaceView; | ||
| 17 | |||
| 14 | class BindBuffersRangePushBuffer { | 18 | class BindBuffersRangePushBuffer { |
| 15 | public: | 19 | public: |
| 16 | BindBuffersRangePushBuffer(GLenum target); | 20 | BindBuffersRangePushBuffer(GLenum target); |
| @@ -30,6 +34,19 @@ private: | |||
| 30 | std::vector<GLsizeiptr> sizes; | 34 | std::vector<GLsizeiptr> sizes; |
| 31 | }; | 35 | }; |
| 32 | 36 | ||
| 37 | class SurfaceBlitter { | ||
| 38 | public: | ||
| 39 | explicit SurfaceBlitter(); | ||
| 40 | ~SurfaceBlitter(); | ||
| 41 | |||
| 42 | void Blit(CachedSurfaceView* src, CachedSurfaceView* dst, | ||
| 43 | const Common::Rectangle<u32>& src_rect, const Common::Rectangle<u32>& dst_rect) const; | ||
| 44 | |||
| 45 | private: | ||
| 46 | OGLFramebuffer src_framebuffer; | ||
| 47 | OGLFramebuffer dst_framebuffer; | ||
| 48 | }; | ||
| 49 | |||
| 33 | void LabelGLObject(GLenum identifier, GLuint handle, VAddr addr, std::string_view extra_info = {}); | 50 | void LabelGLObject(GLenum identifier, GLuint handle, VAddr addr, std::string_view extra_info = {}); |
| 34 | 51 | ||
| 35 | } // namespace OpenGL \ No newline at end of file | 52 | } // namespace OpenGL \ No newline at end of file |