diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/video_core/rasterizer_interface.h | 5 | ||||
| -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_rasterizer_cache.cpp | 4 | ||||
| -rw-r--r-- | src/video_core/surface.h | 3 |
5 files changed, 1 insertions, 17 deletions
diff --git a/src/video_core/rasterizer_interface.h b/src/video_core/rasterizer_interface.h index ff5310848..4c08bb148 100644 --- a/src/video_core/rasterizer_interface.h +++ b/src/video_core/rasterizer_interface.h | |||
| @@ -49,11 +49,6 @@ public: | |||
| 49 | return false; | 49 | return false; |
| 50 | } | 50 | } |
| 51 | 51 | ||
| 52 | /// Attempt to use a faster method to fill a region | ||
| 53 | virtual bool AccelerateFill(const void* config) { | ||
| 54 | return false; | ||
| 55 | } | ||
| 56 | |||
| 57 | /// Attempt to use a faster method to display the framebuffer to screen | 52 | /// Attempt to use a faster method to display the framebuffer to screen |
| 58 | virtual bool AccelerateDisplay(const Tegra::FramebufferConfig& config, VAddr framebuffer_addr, | 53 | virtual bool AccelerateDisplay(const Tegra::FramebufferConfig& config, VAddr framebuffer_addr, |
| 59 | u32 pixel_stride) { | 54 | u32 pixel_stride) { |
diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp index ee313cb2f..c6d63ed7d 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp | |||
| @@ -781,11 +781,6 @@ bool RasterizerOpenGL::AccelerateSurfaceCopy(const Tegra::Engines::Fermi2D::Regs | |||
| 781 | return true; | 781 | return true; |
| 782 | } | 782 | } |
| 783 | 783 | ||
| 784 | bool RasterizerOpenGL::AccelerateFill(const void* config) { | ||
| 785 | UNREACHABLE(); | ||
| 786 | return true; | ||
| 787 | } | ||
| 788 | |||
| 789 | bool RasterizerOpenGL::AccelerateDisplay(const Tegra::FramebufferConfig& config, | 784 | bool RasterizerOpenGL::AccelerateDisplay(const Tegra::FramebufferConfig& config, |
| 790 | VAddr framebuffer_addr, u32 pixel_stride) { | 785 | VAddr framebuffer_addr, u32 pixel_stride) { |
| 791 | if (!framebuffer_addr) { | 786 | if (!framebuffer_addr) { |
diff --git a/src/video_core/renderer_opengl/gl_rasterizer.h b/src/video_core/renderer_opengl/gl_rasterizer.h index a103692f9..22a0796b6 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.h +++ b/src/video_core/renderer_opengl/gl_rasterizer.h | |||
| @@ -56,7 +56,6 @@ public: | |||
| 56 | void FlushAndInvalidateRegion(VAddr addr, u64 size) override; | 56 | void FlushAndInvalidateRegion(VAddr addr, u64 size) override; |
| 57 | bool AccelerateSurfaceCopy(const Tegra::Engines::Fermi2D::Regs::Surface& src, | 57 | bool AccelerateSurfaceCopy(const Tegra::Engines::Fermi2D::Regs::Surface& src, |
| 58 | const Tegra::Engines::Fermi2D::Regs::Surface& dst) override; | 58 | const Tegra::Engines::Fermi2D::Regs::Surface& dst) override; |
| 59 | bool AccelerateFill(const void* config) override; | ||
| 60 | bool AccelerateDisplay(const Tegra::FramebufferConfig& config, VAddr framebuffer_addr, | 59 | bool AccelerateDisplay(const Tegra::FramebufferConfig& config, VAddr framebuffer_addr, |
| 61 | u32 pixel_stride) override; | 60 | u32 pixel_stride) override; |
| 62 | bool AccelerateDrawBatch(bool is_indexed) override; | 61 | bool AccelerateDrawBatch(bool is_indexed) override; |
diff --git a/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp b/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp index 2b9c4628f..50286432d 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp | |||
| @@ -734,7 +734,6 @@ void CachedSurface::FlushGLBuffer() { | |||
| 734 | glPixelStorei(GL_PACK_ROW_LENGTH, 0); | 734 | glPixelStorei(GL_PACK_ROW_LENGTH, 0); |
| 735 | ConvertFormatAsNeeded_FlushGLBuffer(gl_buffer[0], params.pixel_format, params.width, | 735 | ConvertFormatAsNeeded_FlushGLBuffer(gl_buffer[0], params.pixel_format, params.width, |
| 736 | params.height); | 736 | params.height); |
| 737 | ASSERT(params.type != SurfaceType::Fill); | ||
| 738 | const u8* const texture_src_data = Memory::GetPointer(params.addr); | 737 | const u8* const texture_src_data = Memory::GetPointer(params.addr); |
| 739 | ASSERT(texture_src_data); | 738 | ASSERT(texture_src_data); |
| 740 | if (params.is_tiled) { | 739 | if (params.is_tiled) { |
| @@ -904,9 +903,6 @@ void CachedSurface::EnsureTextureView() { | |||
| 904 | 903 | ||
| 905 | MICROPROFILE_DEFINE(OpenGL_TextureUL, "OpenGL", "Texture Upload", MP_RGB(128, 192, 64)); | 904 | MICROPROFILE_DEFINE(OpenGL_TextureUL, "OpenGL", "Texture Upload", MP_RGB(128, 192, 64)); |
| 906 | void CachedSurface::UploadGLTexture(GLuint read_fb_handle, GLuint draw_fb_handle) { | 905 | void CachedSurface::UploadGLTexture(GLuint read_fb_handle, GLuint draw_fb_handle) { |
| 907 | if (params.type == SurfaceType::Fill) | ||
| 908 | return; | ||
| 909 | |||
| 910 | MICROPROFILE_SCOPE(OpenGL_TextureUL); | 906 | MICROPROFILE_SCOPE(OpenGL_TextureUL); |
| 911 | 907 | ||
| 912 | for (u32 i = 0; i < params.max_mip_level; i++) | 908 | for (u32 i = 0; i < params.max_mip_level; i++) |
diff --git a/src/video_core/surface.h b/src/video_core/surface.h index edd3816ba..b783e4b27 100644 --- a/src/video_core/surface.h +++ b/src/video_core/surface.h | |||
| @@ -109,8 +109,7 @@ enum class SurfaceType { | |||
| 109 | ColorTexture = 0, | 109 | ColorTexture = 0, |
| 110 | Depth = 1, | 110 | Depth = 1, |
| 111 | DepthStencil = 2, | 111 | DepthStencil = 2, |
| 112 | Fill = 3, | 112 | Invalid = 3, |
| 113 | Invalid = 4, | ||
| 114 | }; | 113 | }; |
| 115 | 114 | ||
| 116 | enum class SurfaceTarget { | 115 | enum class SurfaceTarget { |