Browse Source
Merge pull request #2079 from ReinUsesLisp/remove-fill
video_core: Remove unused Fill related code
pull/15/merge
bunnei
7 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with
1 additions and
17 deletions
-
src/video_core/rasterizer_interface.h
-
src/video_core/renderer_opengl/gl_rasterizer.cpp
-
src/video_core/renderer_opengl/gl_rasterizer.h
-
src/video_core/renderer_opengl/gl_rasterizer_cache.cpp
-
src/video_core/surface.h
|
|
|
@ -49,11 +49,6 @@ public: |
|
|
|
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 |
|
|
|
virtual bool AccelerateDisplay(const Tegra::FramebufferConfig& config, VAddr framebuffer_addr, |
|
|
|
u32 pixel_stride) { |
|
|
|
|
|
|
|
@ -781,11 +781,6 @@ bool RasterizerOpenGL::AccelerateSurfaceCopy(const Tegra::Engines::Fermi2D::Regs |
|
|
|
return true; |
|
|
|
} |
|
|
|
|
|
|
|
bool RasterizerOpenGL::AccelerateFill(const void* config) { |
|
|
|
UNREACHABLE(); |
|
|
|
return true; |
|
|
|
} |
|
|
|
|
|
|
|
bool RasterizerOpenGL::AccelerateDisplay(const Tegra::FramebufferConfig& config, |
|
|
|
VAddr framebuffer_addr, u32 pixel_stride) { |
|
|
|
if (!framebuffer_addr) { |
|
|
|
|
|
|
|
@ -56,7 +56,6 @@ public: |
|
|
|
void FlushAndInvalidateRegion(VAddr addr, u64 size) override; |
|
|
|
bool AccelerateSurfaceCopy(const Tegra::Engines::Fermi2D::Regs::Surface& src, |
|
|
|
const Tegra::Engines::Fermi2D::Regs::Surface& dst) override; |
|
|
|
bool AccelerateFill(const void* config) override; |
|
|
|
bool AccelerateDisplay(const Tegra::FramebufferConfig& config, VAddr framebuffer_addr, |
|
|
|
u32 pixel_stride) override; |
|
|
|
bool AccelerateDrawBatch(bool is_indexed) override; |
|
|
|
|
|
|
|
@ -734,7 +734,6 @@ void CachedSurface::FlushGLBuffer() { |
|
|
|
glPixelStorei(GL_PACK_ROW_LENGTH, 0); |
|
|
|
ConvertFormatAsNeeded_FlushGLBuffer(gl_buffer[0], params.pixel_format, params.width, |
|
|
|
params.height); |
|
|
|
ASSERT(params.type != SurfaceType::Fill); |
|
|
|
const u8* const texture_src_data = Memory::GetPointer(params.addr); |
|
|
|
ASSERT(texture_src_data); |
|
|
|
if (params.is_tiled) { |
|
|
|
@ -904,9 +903,6 @@ void CachedSurface::EnsureTextureView() { |
|
|
|
|
|
|
|
MICROPROFILE_DEFINE(OpenGL_TextureUL, "OpenGL", "Texture Upload", MP_RGB(128, 192, 64)); |
|
|
|
void CachedSurface::UploadGLTexture(GLuint read_fb_handle, GLuint draw_fb_handle) { |
|
|
|
if (params.type == SurfaceType::Fill) |
|
|
|
return; |
|
|
|
|
|
|
|
MICROPROFILE_SCOPE(OpenGL_TextureUL); |
|
|
|
|
|
|
|
for (u32 i = 0; i < params.max_mip_level; i++) |
|
|
|
|
|
|
|
@ -109,8 +109,7 @@ enum class SurfaceType { |
|
|
|
ColorTexture = 0, |
|
|
|
Depth = 1, |
|
|
|
DepthStencil = 2, |
|
|
|
Fill = 3, |
|
|
|
Invalid = 4, |
|
|
|
Invalid = 3, |
|
|
|
}; |
|
|
|
|
|
|
|
enum class SurfaceTarget { |
|
|
|
|