Преглед изворни кода

Merge pull request #2079 from ReinUsesLisp/remove-fill

video_core: Remove unused Fill related code
bunnei пре 7 година
родитељ
комит
3a6eef27a2

+ 0 - 5
src/video_core/rasterizer_interface.h

@@ -49,11 +49,6 @@ public:
         return false;
         return false;
     }
     }
 
 
-    /// Attempt to use a faster method to fill a region
-    virtual bool AccelerateFill(const void* config) {
-        return false;
-    }
-
     /// Attempt to use a faster method to display the framebuffer to screen
     /// Attempt to use a faster method to display the framebuffer to screen
     virtual bool AccelerateDisplay(const Tegra::FramebufferConfig& config, VAddr framebuffer_addr,
     virtual bool AccelerateDisplay(const Tegra::FramebufferConfig& config, VAddr framebuffer_addr,
                                    u32 pixel_stride) {
                                    u32 pixel_stride) {

+ 0 - 5
src/video_core/renderer_opengl/gl_rasterizer.cpp

@@ -781,11 +781,6 @@ bool RasterizerOpenGL::AccelerateSurfaceCopy(const Tegra::Engines::Fermi2D::Regs
     return true;
     return true;
 }
 }
 
 
-bool RasterizerOpenGL::AccelerateFill(const void* config) {
-    UNREACHABLE();
-    return true;
-}
-
 bool RasterizerOpenGL::AccelerateDisplay(const Tegra::FramebufferConfig& config,
 bool RasterizerOpenGL::AccelerateDisplay(const Tegra::FramebufferConfig& config,
                                          VAddr framebuffer_addr, u32 pixel_stride) {
                                          VAddr framebuffer_addr, u32 pixel_stride) {
     if (!framebuffer_addr) {
     if (!framebuffer_addr) {

+ 0 - 1
src/video_core/renderer_opengl/gl_rasterizer.h

@@ -56,7 +56,6 @@ public:
     void FlushAndInvalidateRegion(VAddr addr, u64 size) override;
     void FlushAndInvalidateRegion(VAddr addr, u64 size) override;
     bool AccelerateSurfaceCopy(const Tegra::Engines::Fermi2D::Regs::Surface& src,
     bool AccelerateSurfaceCopy(const Tegra::Engines::Fermi2D::Regs::Surface& src,
                                const Tegra::Engines::Fermi2D::Regs::Surface& dst) override;
                                const Tegra::Engines::Fermi2D::Regs::Surface& dst) override;
-    bool AccelerateFill(const void* config) override;
     bool AccelerateDisplay(const Tegra::FramebufferConfig& config, VAddr framebuffer_addr,
     bool AccelerateDisplay(const Tegra::FramebufferConfig& config, VAddr framebuffer_addr,
                            u32 pixel_stride) override;
                            u32 pixel_stride) override;
     bool AccelerateDrawBatch(bool is_indexed) override;
     bool AccelerateDrawBatch(bool is_indexed) override;

+ 0 - 4
src/video_core/renderer_opengl/gl_rasterizer_cache.cpp

@@ -734,7 +734,6 @@ void CachedSurface::FlushGLBuffer() {
     glPixelStorei(GL_PACK_ROW_LENGTH, 0);
     glPixelStorei(GL_PACK_ROW_LENGTH, 0);
     ConvertFormatAsNeeded_FlushGLBuffer(gl_buffer[0], params.pixel_format, params.width,
     ConvertFormatAsNeeded_FlushGLBuffer(gl_buffer[0], params.pixel_format, params.width,
                                         params.height);
                                         params.height);
-    ASSERT(params.type != SurfaceType::Fill);
     const u8* const texture_src_data = Memory::GetPointer(params.addr);
     const u8* const texture_src_data = Memory::GetPointer(params.addr);
     ASSERT(texture_src_data);
     ASSERT(texture_src_data);
     if (params.is_tiled) {
     if (params.is_tiled) {
@@ -904,9 +903,6 @@ void CachedSurface::EnsureTextureView() {
 
 
 MICROPROFILE_DEFINE(OpenGL_TextureUL, "OpenGL", "Texture Upload", MP_RGB(128, 192, 64));
 MICROPROFILE_DEFINE(OpenGL_TextureUL, "OpenGL", "Texture Upload", MP_RGB(128, 192, 64));
 void CachedSurface::UploadGLTexture(GLuint read_fb_handle, GLuint draw_fb_handle) {
 void CachedSurface::UploadGLTexture(GLuint read_fb_handle, GLuint draw_fb_handle) {
-    if (params.type == SurfaceType::Fill)
-        return;
-
     MICROPROFILE_SCOPE(OpenGL_TextureUL);
     MICROPROFILE_SCOPE(OpenGL_TextureUL);
 
 
     for (u32 i = 0; i < params.max_mip_level; i++)
     for (u32 i = 0; i < params.max_mip_level; i++)

+ 1 - 2
src/video_core/surface.h

@@ -109,8 +109,7 @@ enum class SurfaceType {
     ColorTexture = 0,
     ColorTexture = 0,
     Depth = 1,
     Depth = 1,
     DepthStencil = 2,
     DepthStencil = 2,
-    Fill = 3,
-    Invalid = 4,
+    Invalid = 3,
 };
 };
 
 
 enum class SurfaceTarget {
 enum class SurfaceTarget {