OpenPunk/citra
1
0
Fork 0
mirror of https://github.com/citra-emu/citra.git synced 2024-11-25 08:20:16 +00:00
Code Issues Projects Releases Wiki Activity

rasterizer: explicitely convert BitField fields to unsigned char

Browse Source 
Fixes a narrowing warning
This commit is contained in:
Paul Dettorer Hervot 2015-12-16 12:21:12 +01:00 committed by Paul "Dettorer" Hervot
parent e9da6794f0
commit 3ae3b44d71
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/video_core/rasterizer.cpp
View File

@ -472,7 +472,11 @@ static void ProcessTriangleInternal(const Shader::OutputVertex& v0,
if ((texture.config.wrap_s == Regs::TextureConfig::ClampToBorder && (s < 0 || s >= texture.config.width)) if ((texture.config.wrap_s == Regs::TextureConfig::ClampToBorder && (s < 0 || s >= texture.config.width))
|| (texture.config.wrap_t == Regs::TextureConfig::ClampToBorder && (t < 0 || t >= texture.config.height))) { || (texture.config.wrap_t == Regs::TextureConfig::ClampToBorder && (t < 0 || t >= texture.config.height))) {
auto border_color = texture.config.border_color; auto border_color = texture.config.border_color;
texture_color[i] = { border_color.r, border_color.g, border_color.b, border_color.a }; texture_color[i] = { static_cast<u8>(border_color.r),
static_cast<u8>(border_color.g),
static_cast<u8>(border_color.b),
static_cast<u8>(border_color.a)
};
} else { } else {
// Textures are laid out from bottom to top, hence we invert the t coordinate. // Textures are laid out from bottom to top, hence we invert the t coordinate.
// NOTE: This may not be the right place for the inversion. // NOTE: This may not be the right place for the inversion.
@ -501,8 +505,10 @@ static void ProcessTriangleInternal(const Shader::OutputVertex& v0,
Math::Vec4<u8> combiner_output; Math::Vec4<u8> combiner_output;
Math::Vec4<u8> combiner_buffer = {0, 0, 0, 0}; Math::Vec4<u8> combiner_buffer = {0, 0, 0, 0};
Math::Vec4<u8> next_combiner_buffer = { Math::Vec4<u8> next_combiner_buffer = {
regs.tev_combiner_buffer_color.r, regs.tev_combiner_buffer_color.g, static_cast<u8>(regs.tev_combiner_buffer_color.r),
regs.tev_combiner_buffer_color.b, regs.tev_combiner_buffer_color.a static_cast<u8>(regs.tev_combiner_buffer_color.g),
static_cast<u8>(regs.tev_combiner_buffer_color.b),
static_cast<u8>(regs.tev_combiner_buffer_color.a)
}; };
for (unsigned tev_stage_index = 0; tev_stage_index < tev_stages.size(); ++tev_stage_index) { for (unsigned tev_stage_index = 0; tev_stage_index < tev_stages.size(); ++tev_stage_index) {
@ -537,7 +543,11 @@ static void ProcessTriangleInternal(const Shader::OutputVertex& v0,
return combiner_buffer; return combiner_buffer;
case Source::Constant: case Source::Constant:
return {tev_stage.const_r, tev_stage.const_g, tev_stage.const_b, tev_stage.const_a}; return { static_cast<u8>(tev_stage.const_r),
static_cast<u8>(tev_stage.const_g),
static_cast<u8>(tev_stage.const_b),
static_cast<u8>(tev_stage.const_a)
};
case Source::Previous: case Source::Previous:
return combiner_output; return combiner_output;