summaryrefslogtreecommitdiffstats
path: root/src/video_core/renderer_opengl/gl_rasterizer.cpp
diff options
context:
space:
mode:
authorYuri Kunde Schlesner <yuriks@yuriks.net>2015-08-30 14:15:35 +0200
committerYuri Kunde Schlesner <yuriks@yuriks.net>2015-09-03 20:09:51 +0200
commit466e608c19c5bd70392bd4f4049fc7ba9963a14c (patch)
treee08a8ca19c935f4b2513151e0f280a29940f6d24 /src/video_core/renderer_opengl/gl_rasterizer.cpp
parentOpenGL: Add support for Sampler Objects to state tracker (diff)
downloadyuzu-466e608c19c5bd70392bd4f4049fc7ba9963a14c.tar
yuzu-466e608c19c5bd70392bd4f4049fc7ba9963a14c.tar.gz
yuzu-466e608c19c5bd70392bd4f4049fc7ba9963a14c.tar.bz2
yuzu-466e608c19c5bd70392bd4f4049fc7ba9963a14c.tar.lz
yuzu-466e608c19c5bd70392bd4f4049fc7ba9963a14c.tar.xz
yuzu-466e608c19c5bd70392bd4f4049fc7ba9963a14c.tar.zst
yuzu-466e608c19c5bd70392bd4f4049fc7ba9963a14c.zip
Diffstat (limited to '')
-rw-r--r--src/video_core/renderer_opengl/gl_rasterizer.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp
index 80e773728..b556ea65b 100644
--- a/src/video_core/renderer_opengl/gl_rasterizer.cpp
+++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp
@@ -658,7 +658,7 @@ void RasterizerOpenGL::SyncBlendFuncs() {
}
void RasterizerOpenGL::SyncBlendColor() {
- auto blend_color = PicaToGL::ColorRGBA8((u8*)&Pica::g_state.regs.output_merger.blend_const.r);
+ auto blend_color = PicaToGL::ColorRGBA8(Pica::g_state.regs.output_merger.blend_const.raw);
state.blend.color.red = blend_color[0];
state.blend.color.green = blend_color[1];
state.blend.color.blue = blend_color[2];
@@ -728,7 +728,7 @@ void RasterizerOpenGL::SyncTevOps(unsigned stage_index, const Pica::Regs::TevSta
}
void RasterizerOpenGL::SyncTevColor(unsigned stage_index, const Pica::Regs::TevStageConfig& config) {
- auto const_color = PicaToGL::ColorRGBA8((u8*)&config.const_r);
+ auto const_color = PicaToGL::ColorRGBA8(config.const_color);
glUniform4fv(uniform_tev_cfgs[stage_index].const_color, 1, const_color.data());
}
@@ -737,7 +737,7 @@ void RasterizerOpenGL::SyncTevMultipliers(unsigned stage_index, const Pica::Regs
}
void RasterizerOpenGL::SyncCombinerColor() {
- auto combiner_color = PicaToGL::ColorRGBA8((u8*)&Pica::g_state.regs.tev_combiner_buffer_color.r);
+ auto combiner_color = PicaToGL::ColorRGBA8(Pica::g_state.regs.tev_combiner_buffer_color.raw);
glUniform4fv(uniform_tev_combiner_buffer_color, 1, combiner_color.data());
}