diff options
| author | 2018-03-24 22:50:21 -0400 | |
|---|---|---|
| committer | 2018-03-26 21:17:00 -0400 | |
| commit | d89bfec5f55854daa1ff717e4a5f721bfa08a541 (patch) | |
| tree | b8bdaa18edcf182d09194b1799b1c40387b1a76f /src | |
| parent | gl_rasterizer: Use passthrough shader for SetupVertexShader. (diff) | |
| download | yuzu-d89bfec5f55854daa1ff717e4a5f721bfa08a541.tar.gz yuzu-d89bfec5f55854daa1ff717e4a5f721bfa08a541.tar.xz yuzu-d89bfec5f55854daa1ff717e4a5f721bfa08a541.zip | |
rasterizer: Rename DrawTriangles to DrawArrays.
Diffstat (limited to 'src')
| -rw-r--r-- | src/video_core/rasterizer_interface.h | 4 | ||||
| -rw-r--r-- | src/video_core/renderer_opengl/gl_rasterizer.cpp | 4 | ||||
| -rw-r--r-- | src/video_core/renderer_opengl/gl_rasterizer.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/video_core/rasterizer_interface.h b/src/video_core/rasterizer_interface.h index a493e1d60..8239f9aad 100644 --- a/src/video_core/rasterizer_interface.h +++ b/src/video_core/rasterizer_interface.h | |||
| @@ -15,8 +15,8 @@ class RasterizerInterface { | |||
| 15 | public: | 15 | public: |
| 16 | virtual ~RasterizerInterface() {} | 16 | virtual ~RasterizerInterface() {} |
| 17 | 17 | ||
| 18 | /// Draw the current batch of triangles | 18 | /// Draw the current batch of vertex arrays |
| 19 | virtual void DrawTriangles() = 0; | 19 | virtual void DrawArrays() = 0; |
| 20 | 20 | ||
| 21 | /// Notify rasterizer that the specified Maxwell register has been changed | 21 | /// Notify rasterizer that the specified Maxwell register has been changed |
| 22 | virtual void NotifyMaxwellRegisterChanged(u32 id) = 0; | 22 | virtual void NotifyMaxwellRegisterChanged(u32 id) = 0; |
diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp index 630b46737..dfc4beb9a 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp | |||
| @@ -212,12 +212,12 @@ bool RasterizerOpenGL::AccelerateDrawBatch(bool is_indexed) { | |||
| 212 | } | 212 | } |
| 213 | 213 | ||
| 214 | accelerate_draw = is_indexed ? AccelDraw::Indexed : AccelDraw::Arrays; | 214 | accelerate_draw = is_indexed ? AccelDraw::Indexed : AccelDraw::Arrays; |
| 215 | DrawTriangles(); | 215 | DrawArrays(); |
| 216 | 216 | ||
| 217 | return true; | 217 | return true; |
| 218 | } | 218 | } |
| 219 | 219 | ||
| 220 | void RasterizerOpenGL::DrawTriangles() { | 220 | void RasterizerOpenGL::DrawArrays() { |
| 221 | if (accelerate_draw == AccelDraw::Disabled) | 221 | if (accelerate_draw == AccelDraw::Disabled) |
| 222 | return; | 222 | return; |
| 223 | 223 | ||
diff --git a/src/video_core/renderer_opengl/gl_rasterizer.h b/src/video_core/renderer_opengl/gl_rasterizer.h index 71a5437a2..c889b1aff 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.h +++ b/src/video_core/renderer_opengl/gl_rasterizer.h | |||
| @@ -29,7 +29,7 @@ public: | |||
| 29 | RasterizerOpenGL(); | 29 | RasterizerOpenGL(); |
| 30 | ~RasterizerOpenGL() override; | 30 | ~RasterizerOpenGL() override; |
| 31 | 31 | ||
| 32 | void DrawTriangles() override; | 32 | void DrawArrays() override; |
| 33 | void NotifyMaxwellRegisterChanged(u32 id) override; | 33 | void NotifyMaxwellRegisterChanged(u32 id) override; |
| 34 | void FlushAll() override; | 34 | void FlushAll() override; |
| 35 | void FlushRegion(VAddr addr, u64 size) override; | 35 | void FlushRegion(VAddr addr, u64 size) override; |