From 91aa58e41072e648cd1d43d284b08c2a01af08a2 Mon Sep 17 00:00:00 2001 From: ReinUsesLisp Date: Fri, 14 Feb 2020 18:09:37 -0300 Subject: maxwell_3d: Unify draw methods Pass instanced state of a draw invocation as an argument instead of having two separate virtual methods. --- src/video_core/renderer_opengl/gl_rasterizer.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'src/video_core/renderer_opengl/gl_rasterizer.h') 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); -- cgit v1.2.3