diff options
| author | 2018-09-01 02:09:26 -0400 | |
|---|---|---|
| committer | 2018-09-08 02:53:37 -0400 | |
| commit | a439f7b6e1ecbaebdba5396fea1c7b171fcd17e8 (patch) | |
| tree | 26e7799c7485ca87c5a1eeb69f4f24d6b0bf7c40 /src | |
| parent | gl_state: Keep track of texture target. (diff) | |
| download | yuzu-a439f7b6e1ecbaebdba5396fea1c7b171fcd17e8.tar.gz yuzu-a439f7b6e1ecbaebdba5396fea1c7b171fcd17e8.tar.xz yuzu-a439f7b6e1ecbaebdba5396fea1c7b171fcd17e8.zip | |
gl_rasterizer_cache: Remove unused DownloadGLTexture.
Diffstat (limited to 'src')
| -rw-r--r-- | src/video_core/renderer_opengl/gl_rasterizer_cache.cpp | 50 | ||||
| -rw-r--r-- | src/video_core/renderer_opengl/gl_rasterizer_cache.h | 1 |
2 files changed, 0 insertions, 51 deletions
diff --git a/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp b/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp index ea2e6a3a2..0df1bbf6b 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp | |||
| @@ -626,55 +626,6 @@ void CachedSurface::UploadGLTexture(GLuint read_fb_handle, GLuint draw_fb_handle | |||
| 626 | cur_state.Apply(); | 626 | cur_state.Apply(); |
| 627 | } | 627 | } |
| 628 | 628 | ||
| 629 | MICROPROFILE_DEFINE(OpenGL_TextureDL, "OpenGL", "Texture Download", MP_RGB(128, 192, 64)); | ||
| 630 | void CachedSurface::DownloadGLTexture(GLuint read_fb_handle, GLuint draw_fb_handle) { | ||
| 631 | if (params.type == SurfaceType::Fill) | ||
| 632 | return; | ||
| 633 | |||
| 634 | MICROPROFILE_SCOPE(OpenGL_TextureDL); | ||
| 635 | |||
| 636 | gl_buffer.resize(params.width * params.height * GetGLBytesPerPixel(params.pixel_format)); | ||
| 637 | |||
| 638 | OpenGLState state = OpenGLState::GetCurState(); | ||
| 639 | OpenGLState prev_state = state; | ||
| 640 | SCOPE_EXIT({ prev_state.Apply(); }); | ||
| 641 | |||
| 642 | const FormatTuple& tuple = GetFormatTuple(params.pixel_format, params.component_type); | ||
| 643 | |||
| 644 | // Ensure no bad interactions with GL_PACK_ALIGNMENT | ||
| 645 | ASSERT(params.width * GetGLBytesPerPixel(params.pixel_format) % 4 == 0); | ||
| 646 | glPixelStorei(GL_PACK_ROW_LENGTH, static_cast<GLint>(params.width)); | ||
| 647 | |||
| 648 | const auto& rect{params.GetRect()}; | ||
| 649 | size_t buffer_offset = | ||
| 650 | (rect.bottom * params.width + rect.left) * GetGLBytesPerPixel(params.pixel_format); | ||
| 651 | |||
| 652 | state.UnbindTexture(texture.handle); | ||
| 653 | state.draw.read_framebuffer = read_fb_handle; | ||
| 654 | state.Apply(); | ||
| 655 | |||
| 656 | if (params.type == SurfaceType::ColorTexture) { | ||
| 657 | glFramebufferTexture2D(GL_READ_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, | ||
| 658 | texture.handle, 0); | ||
| 659 | glFramebufferTexture2D(GL_READ_FRAMEBUFFER, GL_DEPTH_STENCIL_ATTACHMENT, GL_TEXTURE_2D, 0, | ||
| 660 | 0); | ||
| 661 | } else if (params.type == SurfaceType::Depth) { | ||
| 662 | glFramebufferTexture2D(GL_READ_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, 0, 0); | ||
| 663 | glFramebufferTexture2D(GL_READ_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_TEXTURE_2D, | ||
| 664 | texture.handle, 0); | ||
| 665 | glFramebufferTexture2D(GL_READ_FRAMEBUFFER, GL_STENCIL_ATTACHMENT, GL_TEXTURE_2D, 0, 0); | ||
| 666 | } else { | ||
| 667 | glFramebufferTexture2D(GL_READ_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, 0, 0); | ||
| 668 | glFramebufferTexture2D(GL_READ_FRAMEBUFFER, GL_DEPTH_STENCIL_ATTACHMENT, GL_TEXTURE_2D, | ||
| 669 | texture.handle, 0); | ||
| 670 | } | ||
| 671 | glReadPixels(static_cast<GLint>(rect.left), static_cast<GLint>(rect.bottom), | ||
| 672 | static_cast<GLsizei>(rect.GetWidth()), static_cast<GLsizei>(rect.GetHeight()), | ||
| 673 | tuple.format, tuple.type, &gl_buffer[buffer_offset]); | ||
| 674 | |||
| 675 | glPixelStorei(GL_PACK_ROW_LENGTH, 0); | ||
| 676 | } | ||
| 677 | |||
| 678 | RasterizerCacheOpenGL::RasterizerCacheOpenGL() { | 629 | RasterizerCacheOpenGL::RasterizerCacheOpenGL() { |
| 679 | read_framebuffer.Create(); | 630 | read_framebuffer.Create(); |
| 680 | draw_framebuffer.Create(); | 631 | draw_framebuffer.Create(); |
| @@ -748,7 +699,6 @@ void RasterizerCacheOpenGL::LoadSurface(const Surface& surface) { | |||
| 748 | } | 699 | } |
| 749 | 700 | ||
| 750 | void RasterizerCacheOpenGL::FlushSurface(const Surface& surface) { | 701 | void RasterizerCacheOpenGL::FlushSurface(const Surface& surface) { |
| 751 | surface->DownloadGLTexture(read_framebuffer.handle, draw_framebuffer.handle); | ||
| 752 | surface->FlushGLBuffer(); | 702 | surface->FlushGLBuffer(); |
| 753 | } | 703 | } |
| 754 | 704 | ||
diff --git a/src/video_core/renderer_opengl/gl_rasterizer_cache.h b/src/video_core/renderer_opengl/gl_rasterizer_cache.h index aad75f200..b17867f64 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer_cache.h +++ b/src/video_core/renderer_opengl/gl_rasterizer_cache.h | |||
| @@ -726,7 +726,6 @@ public: | |||
| 726 | 726 | ||
| 727 | // Upload/Download data in gl_buffer in/to this surface's texture | 727 | // Upload/Download data in gl_buffer in/to this surface's texture |
| 728 | void UploadGLTexture(GLuint read_fb_handle, GLuint draw_fb_handle); | 728 | void UploadGLTexture(GLuint read_fb_handle, GLuint draw_fb_handle); |
| 729 | void DownloadGLTexture(GLuint read_fb_handle, GLuint draw_fb_handle); | ||
| 730 | 729 | ||
| 731 | private: | 730 | private: |
| 732 | OGLTexture texture; | 731 | OGLTexture texture; |