diff options
author | ReinUsesLisp <reinuseslisp@airmail.cc> | 2020-02-14 22:09:37 +0100 |
---|---|---|
committer | ReinUsesLisp <reinuseslisp@airmail.cc> | 2020-02-14 22:09:40 +0100 |
commit | 91aa58e41072e648cd1d43d284b08c2a01af08a2 (patch) | |
tree | a8d4f0ab607c9e0868cdb4da65163318312a714d /src/video_core/renderer_opengl | |
parent | Merge pull request #3401 from FernandoS27/synchronization (diff) | |
download | yuzu-91aa58e41072e648cd1d43d284b08c2a01af08a2.tar yuzu-91aa58e41072e648cd1d43d284b08c2a01af08a2.tar.gz yuzu-91aa58e41072e648cd1d43d284b08c2a01af08a2.tar.bz2 yuzu-91aa58e41072e648cd1d43d284b08c2a01af08a2.tar.lz yuzu-91aa58e41072e648cd1d43d284b08c2a01af08a2.tar.xz yuzu-91aa58e41072e648cd1d43d284b08c2a01af08a2.tar.zst yuzu-91aa58e41072e648cd1d43d284b08c2a01af08a2.zip |
Diffstat (limited to 'src/video_core/renderer_opengl')
-rw-r--r-- | src/video_core/renderer_opengl/gl_rasterizer.cpp | 10 | ||||
-rw-r--r-- | src/video_core/renderer_opengl/gl_rasterizer.h | 6 |
2 files changed, 1 insertions, 15 deletions
diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp index b0eb14c8b..048d43b89 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp @@ -657,16 +657,6 @@ void RasterizerOpenGL::Draw(bool is_indexed, bool is_instanced) { } } -bool RasterizerOpenGL::DrawBatch(bool is_indexed) { - Draw(is_indexed, false); - return true; -} - -bool RasterizerOpenGL::DrawMultiBatch(bool is_indexed) { - Draw(is_indexed, true); - return true; -} - void RasterizerOpenGL::DispatchCompute(GPUVAddr code_addr) { if (device.HasBrokenCompute()) { return; diff --git a/src/video_core/renderer_opengl/gl_rasterizer.h b/src/video_core/renderer_opengl/gl_rasterizer.h index 0501f3828..bc28a3bcf 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.h +++ b/src/video_core/renderer_opengl/gl_rasterizer.h @@ -57,8 +57,7 @@ public: ScreenInfo& info); ~RasterizerOpenGL() override; - bool DrawBatch(bool is_indexed) override; - bool DrawMultiBatch(bool is_indexed) override; + void Draw(bool is_indexed, bool is_instanced) override; void Clear() override; void DispatchCompute(GPUVAddr code_addr) override; void FlushAll() override; @@ -102,9 +101,6 @@ private: void SetupGlobalMemory(u32 binding, const GLShader::GlobalMemoryEntry& entry, GPUVAddr gpu_addr, std::size_t size); - /// Syncs all the state, shaders, render targets and textures setting before a draw call. - void Draw(bool is_indexed, bool is_instanced); - /// Configures the current textures to use for the draw command. void SetupDrawTextures(std::size_t stage_index, const Shader& shader); |