diff options
| author | 2019-02-01 02:55:30 -0300 | |
|---|---|---|
| committer | 2019-02-01 02:57:47 -0300 | |
| commit | 13222f94c04a7036d3c9f9e5b15721f21296d89b (patch) | |
| tree | 1b88fe1dfaff481498bdc7fa24f98356259eca44 | |
| parent | Merge pull request #2072 from lioncash/service (diff) | |
| download | yuzu-13222f94c04a7036d3c9f9e5b15721f21296d89b.tar.gz yuzu-13222f94c04a7036d3c9f9e5b15721f21296d89b.tar.xz yuzu-13222f94c04a7036d3c9f9e5b15721f21296d89b.zip | |
video_core: Remove unused Fill surface type
| -rw-r--r-- | src/video_core/renderer_opengl/gl_rasterizer_cache.cpp | 4 | ||||
| -rw-r--r-- | src/video_core/surface.h | 3 |
2 files changed, 1 insertions, 6 deletions
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 { |