summaryrefslogtreecommitdiffstats
path: root/src/video_core/renderer_opengl
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2015-07-22 01:04:05 +0200
committerbunnei <bunneidev@gmail.com>2015-08-15 23:33:41 +0200
commit642b9b503040f7da02dcb2c52f3cd4cbf6fee4b2 (patch)
tree85643112608a15fafc304d41c4457a50c453bfcd /src/video_core/renderer_opengl
parentMerge pull request #1027 from lioncash/debugger (diff)
downloadyuzu-642b9b503040f7da02dcb2c52f3cd4cbf6fee4b2.tar
yuzu-642b9b503040f7da02dcb2c52f3cd4cbf6fee4b2.tar.gz
yuzu-642b9b503040f7da02dcb2c52f3cd4cbf6fee4b2.tar.bz2
yuzu-642b9b503040f7da02dcb2c52f3cd4cbf6fee4b2.tar.lz
yuzu-642b9b503040f7da02dcb2c52f3cd4cbf6fee4b2.tar.xz
yuzu-642b9b503040f7da02dcb2c52f3cd4cbf6fee4b2.tar.zst
yuzu-642b9b503040f7da02dcb2c52f3cd4cbf6fee4b2.zip
Diffstat (limited to 'src/video_core/renderer_opengl')
-rw-r--r--src/video_core/renderer_opengl/gl_rasterizer.cpp6
-rw-r--r--src/video_core/renderer_opengl/gl_rasterizer.h10
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() {
res_cache.FullFlush();
}
-void RasterizerOpenGL::AddTriangle(const Pica::VertexShader::OutputVertex& v0,
- const Pica::VertexShader::OutputVertex& v1,
- const Pica::VertexShader::OutputVertex& v2) {
+void RasterizerOpenGL::AddTriangle(const Pica::Shader::OutputVertex& v0,
+ const Pica::Shader::OutputVertex& v1,
+ const Pica::Shader::OutputVertex& v2) {
vertex_batch.push_back(HardwareVertex(v0));
vertex_batch.push_back(HardwareVertex(v1));
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 @@
#include "common/common_types.h"
#include "video_core/hwrasterizer_base.h"
-#include "video_core/vertex_shader.h"
+#include "video_core/shader_interpreter.h"
#include "gl_state.h"
#include "gl_rasterizer_cache.h"
@@ -27,9 +27,9 @@ public:
void Reset() override;
/// Queues the primitive formed by the given vertices for rendering
- void AddTriangle(const Pica::VertexShader::OutputVertex& v0,
- const Pica::VertexShader::OutputVertex& v1,
- const Pica::VertexShader::OutputVertex& v2) override;
+ void AddTriangle(const Pica::Shader::OutputVertex& v0,
+ const Pica::Shader::OutputVertex& v1,
+ const Pica::Shader::OutputVertex& v2) override;
/// Draw the current batch of triangles
void DrawTriangles() override;
@@ -82,7 +82,7 @@ private:
/// Structure that the hardware rendered vertices are composed of
struct HardwareVertex {
- HardwareVertex(const Pica::VertexShader::OutputVertex& v) {
+ HardwareVertex(const Pica::Shader::OutputVertex& v) {
position[0] = v.pos.x.ToFloat32();
position[1] = v.pos.y.ToFloat32();
position[2] = v.pos.z.ToFloat32();