diff options
Diffstat (limited to 'src/video_core/renderer_opengl')
| -rw-r--r-- | src/video_core/renderer_opengl/gl_rasterizer.cpp | 6 | ||||
| -rw-r--r-- | src/video_core/renderer_opengl/gl_rasterizer.h | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp index e7c1cfeb7..9f1552adf 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp | |||
| @@ -202,9 +202,9 @@ void RasterizerOpenGL::Reset() { | |||
| 202 | res_cache.FullFlush(); | 202 | res_cache.FullFlush(); |
| 203 | } | 203 | } |
| 204 | 204 | ||
| 205 | void RasterizerOpenGL::AddTriangle(const Pica::VertexShader::OutputVertex& v0, | 205 | void RasterizerOpenGL::AddTriangle(const Pica::Shader::OutputVertex& v0, |
| 206 | const Pica::VertexShader::OutputVertex& v1, | 206 | const Pica::Shader::OutputVertex& v1, |
| 207 | const Pica::VertexShader::OutputVertex& v2) { | 207 | const Pica::Shader::OutputVertex& v2) { |
| 208 | vertex_batch.push_back(HardwareVertex(v0)); | 208 | vertex_batch.push_back(HardwareVertex(v0)); |
| 209 | vertex_batch.push_back(HardwareVertex(v1)); | 209 | vertex_batch.push_back(HardwareVertex(v1)); |
| 210 | vertex_batch.push_back(HardwareVertex(v2)); | 210 | vertex_batch.push_back(HardwareVertex(v2)); |
diff --git a/src/video_core/renderer_opengl/gl_rasterizer.h b/src/video_core/renderer_opengl/gl_rasterizer.h index ae7b26fc6..9018b5e88 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.h +++ b/src/video_core/renderer_opengl/gl_rasterizer.h | |||
| @@ -9,7 +9,7 @@ | |||
| 9 | #include "common/common_types.h" | 9 | #include "common/common_types.h" |
| 10 | 10 | ||
| 11 | #include "video_core/hwrasterizer_base.h" | 11 | #include "video_core/hwrasterizer_base.h" |
| 12 | #include "video_core/vertex_shader.h" | 12 | #include "video_core/shader_interpreter.h" |
| 13 | 13 | ||
| 14 | #include "gl_state.h" | 14 | #include "gl_state.h" |
| 15 | #include "gl_rasterizer_cache.h" | 15 | #include "gl_rasterizer_cache.h" |
| @@ -27,9 +27,9 @@ public: | |||
| 27 | void Reset() override; | 27 | void Reset() override; |
| 28 | 28 | ||
| 29 | /// Queues the primitive formed by the given vertices for rendering | 29 | /// Queues the primitive formed by the given vertices for rendering |
| 30 | void AddTriangle(const Pica::VertexShader::OutputVertex& v0, | 30 | void AddTriangle(const Pica::Shader::OutputVertex& v0, |
| 31 | const Pica::VertexShader::OutputVertex& v1, | 31 | const Pica::Shader::OutputVertex& v1, |
| 32 | const Pica::VertexShader::OutputVertex& v2) override; | 32 | const Pica::Shader::OutputVertex& v2) override; |
| 33 | 33 | ||
| 34 | /// Draw the current batch of triangles | 34 | /// Draw the current batch of triangles |
| 35 | void DrawTriangles() override; | 35 | void DrawTriangles() override; |
| @@ -82,7 +82,7 @@ private: | |||
| 82 | 82 | ||
| 83 | /// Structure that the hardware rendered vertices are composed of | 83 | /// Structure that the hardware rendered vertices are composed of |
| 84 | struct HardwareVertex { | 84 | struct HardwareVertex { |
| 85 | HardwareVertex(const Pica::VertexShader::OutputVertex& v) { | 85 | HardwareVertex(const Pica::Shader::OutputVertex& v) { |
| 86 | position[0] = v.pos.x.ToFloat32(); | 86 | position[0] = v.pos.x.ToFloat32(); |
| 87 | position[1] = v.pos.y.ToFloat32(); | 87 | position[1] = v.pos.y.ToFloat32(); |
| 88 | position[2] = v.pos.z.ToFloat32(); | 88 | position[2] = v.pos.z.ToFloat32(); |