diff options
author | bunnei <bunneidev@gmail.com> | 2018-11-01 03:31:02 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-11-01 03:31:02 +0100 |
commit | 0b33d38e9bc2793d51f332a548ec5f50c6eaac09 (patch) | |
tree | a71e6a01f1cb2653a927bb22e82ba829eda96b10 /src/video_core/renderer_opengl/gl_rasterizer.cpp | |
parent | Merge pull request #1626 from lioncash/table (diff) | |
parent | video_core: Move surface declarations out of gl_rasterizer_cache (diff) | |
download | yuzu-0b33d38e9bc2793d51f332a548ec5f50c6eaac09.tar yuzu-0b33d38e9bc2793d51f332a548ec5f50c6eaac09.tar.gz yuzu-0b33d38e9bc2793d51f332a548ec5f50c6eaac09.tar.bz2 yuzu-0b33d38e9bc2793d51f332a548ec5f50c6eaac09.tar.lz yuzu-0b33d38e9bc2793d51f332a548ec5f50c6eaac09.tar.xz yuzu-0b33d38e9bc2793d51f332a548ec5f50c6eaac09.tar.zst yuzu-0b33d38e9bc2793d51f332a548ec5f50c6eaac09.zip |
Diffstat (limited to 'src/video_core/renderer_opengl/gl_rasterizer.cpp')
-rw-r--r-- | src/video_core/renderer_opengl/gl_rasterizer.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp index bf381271e..75e31c6de 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp @@ -30,8 +30,8 @@ namespace OpenGL { using Maxwell = Tegra::Engines::Maxwell3D::Regs; -using PixelFormat = SurfaceParams::PixelFormat; -using SurfaceType = SurfaceParams::SurfaceType; +using PixelFormat = VideoCore::Surface::PixelFormat; +using SurfaceType = VideoCore::Surface::SurfaceType; MICROPROFILE_DEFINE(OpenGL_VAO, "OpenGL", "Vertex Array Setup", MP_RGB(128, 128, 192)); MICROPROFILE_DEFINE(OpenGL_Shader, "OpenGL", "Shader Setup", MP_RGB(128, 128, 192)); @@ -703,7 +703,8 @@ bool RasterizerOpenGL::AccelerateDisplay(const Tegra::FramebufferConfig& config, // Verify that the cached surface is the same size and format as the requested framebuffer const auto& params{surface->GetSurfaceParams()}; - const auto& pixel_format{SurfaceParams::PixelFormatFromGPUPixelFormat(config.pixel_format)}; + const auto& pixel_format{ + VideoCore::Surface::PixelFormatFromGPUPixelFormat(config.pixel_format)}; ASSERT_MSG(params.width == config.width, "Framebuffer width is different"); ASSERT_MSG(params.height == config.height, "Framebuffer height is different"); ASSERT_MSG(params.pixel_format == pixel_format, "Framebuffer pixel_format is different"); |