diff options
author | greggameplayer <33609333+greggameplayer@users.noreply.github.com> | 2018-11-02 14:26:32 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-11-02 14:26:32 +0100 |
commit | cb8e4a46330ca23496c3a77f42d9d16dc26e0dbe (patch) | |
tree | cedafffe5a605a1ed914e1d1df1267a3cd299fc9 /src/video_core/renderer_opengl/gl_rasterizer.cpp | |
parent | Implement SurfaceTarget Texture2DArray (diff) | |
parent | Merge pull request #1615 from lioncash/input (diff) | |
download | yuzu-cb8e4a46330ca23496c3a77f42d9d16dc26e0dbe.tar yuzu-cb8e4a46330ca23496c3a77f42d9d16dc26e0dbe.tar.gz yuzu-cb8e4a46330ca23496c3a77f42d9d16dc26e0dbe.tar.bz2 yuzu-cb8e4a46330ca23496c3a77f42d9d16dc26e0dbe.tar.lz yuzu-cb8e4a46330ca23496c3a77f42d9d16dc26e0dbe.tar.xz yuzu-cb8e4a46330ca23496c3a77f42d9d16dc26e0dbe.tar.zst yuzu-cb8e4a46330ca23496c3a77f42d9d16dc26e0dbe.zip |
Diffstat (limited to 'src/video_core/renderer_opengl/gl_rasterizer.cpp')
-rw-r--r-- | src/video_core/renderer_opengl/gl_rasterizer.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp index bf381271e..a0527fe57 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)); @@ -104,7 +104,7 @@ RasterizerOpenGL::RasterizerOpenGL(Core::Frontend::EmuWindow& window, ScreenInfo } ASSERT_MSG(has_ARB_separate_shader_objects, "has_ARB_separate_shader_objects is unsupported"); - + OpenGLState::ApplyDefaultState(); // Clipping plane 0 is always enabled for PICA fixed clip plane z <= 0 state.clip_distance[0] = true; @@ -115,8 +115,6 @@ RasterizerOpenGL::RasterizerOpenGL(Core::Frontend::EmuWindow& window, ScreenInfo state.draw.shader_program = 0; state.Apply(); - glEnable(GL_BLEND); - glGetIntegerv(GL_UNIFORM_BUFFER_OFFSET_ALIGNMENT, &uniform_buffer_alignment); LOG_CRITICAL(Render_OpenGL, "Sync fixed function OpenGL state here!"); @@ -703,7 +701,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"); |