diff options
| author | 2017-01-29 21:38:28 -0800 | |
|---|---|---|
| committer | 2017-01-29 21:38:28 -0800 | |
| commit | 98c71c6a0d291c6f5a070d4f0829d26ebb630e6f (patch) | |
| tree | f6240614de624eea9b7b95bde81eeabeb9c0f2f4 | |
| parent | Merge pull request #2494 from Kloen/killing-warnings-2-final-mix (diff) | |
| parent | video_core: gl_rasterizer_cache.cpp removed unused type alias (diff) | |
| download | yuzu-98c71c6a0d291c6f5a070d4f0829d26ebb630e6f.tar.gz yuzu-98c71c6a0d291c6f5a070d4f0829d26ebb630e6f.tar.xz yuzu-98c71c6a0d291c6f5a070d4f0829d26ebb630e6f.zip | |
Merge pull request #2495 from Kloen/killing-warnings-chain-of-memories
video_core: Removed unused type alias
| -rw-r--r-- | src/video_core/renderer_opengl/gl_rasterizer.cpp | 2 | ||||
| -rw-r--r-- | src/video_core/renderer_opengl/gl_rasterizer_cache.cpp | 1 |
2 files changed, 0 insertions, 3 deletions
diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp index 2d2f4edc1..f3674e965 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp | |||
| @@ -716,8 +716,6 @@ void RasterizerOpenGL::FlushAndInvalidateRegion(PAddr addr, u32 size) { | |||
| 716 | 716 | ||
| 717 | bool RasterizerOpenGL::AccelerateDisplayTransfer(const GPU::Regs::DisplayTransferConfig& config) { | 717 | bool RasterizerOpenGL::AccelerateDisplayTransfer(const GPU::Regs::DisplayTransferConfig& config) { |
| 718 | MICROPROFILE_SCOPE(OpenGL_Blits); | 718 | MICROPROFILE_SCOPE(OpenGL_Blits); |
| 719 | using PixelFormat = CachedSurface::PixelFormat; | ||
| 720 | using SurfaceType = CachedSurface::SurfaceType; | ||
| 721 | 719 | ||
| 722 | CachedSurface src_params; | 720 | CachedSurface src_params; |
| 723 | src_params.addr = config.GetPhysicalInputAddress(); | 721 | src_params.addr = config.GetPhysicalInputAddress(); |
diff --git a/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp b/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp index ef3b06a7b..1e7eedecb 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp | |||
| @@ -172,7 +172,6 @@ bool RasterizerCacheOpenGL::TryBlitSurfaces(CachedSurface* src_surface, | |||
| 172 | const MathUtil::Rectangle<int>& src_rect, | 172 | const MathUtil::Rectangle<int>& src_rect, |
| 173 | CachedSurface* dst_surface, | 173 | CachedSurface* dst_surface, |
| 174 | const MathUtil::Rectangle<int>& dst_rect) { | 174 | const MathUtil::Rectangle<int>& dst_rect) { |
| 175 | using SurfaceType = CachedSurface::SurfaceType; | ||
| 176 | 175 | ||
| 177 | if (!CachedSurface::CheckFormatsBlittable(src_surface->pixel_format, | 176 | if (!CachedSurface::CheckFormatsBlittable(src_surface->pixel_format, |
| 178 | dst_surface->pixel_format)) { | 177 | dst_surface->pixel_format)) { |