diff options
| author | ReinUsesLisp <reinuseslisp@airmail.cc> | 2019-02-01 06:55:30 +0100 |
|---|---|---|
| committer | ReinUsesLisp <reinuseslisp@airmail.cc> | 2019-02-01 06:57:47 +0100 |
| commit | 13222f94c04a7036d3c9f9e5b15721f21296d89b (patch) | |
| tree | 1b88fe1dfaff481498bdc7fa24f98356259eca44 /src/video_core | |
| parent | Merge pull request #2072 from lioncash/service (diff) | |
| download | yuzu-13222f94c04a7036d3c9f9e5b15721f21296d89b.tar yuzu-13222f94c04a7036d3c9f9e5b15721f21296d89b.tar.gz yuzu-13222f94c04a7036d3c9f9e5b15721f21296d89b.tar.bz2 yuzu-13222f94c04a7036d3c9f9e5b15721f21296d89b.tar.lz yuzu-13222f94c04a7036d3c9f9e5b15721f21296d89b.tar.xz yuzu-13222f94c04a7036d3c9f9e5b15721f21296d89b.tar.zst yuzu-13222f94c04a7036d3c9f9e5b15721f21296d89b.zip | |
Diffstat (limited to 'src/video_core')
| -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() { 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++) 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 { ColorTexture = 0, Depth = 1, DepthStencil = 2, - Fill = 3, - Invalid = 4, + Invalid = 3, }; enum class SurfaceTarget { |