N-archive/citra
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

clang-format fix

Browse source
This commit is contained in:
wwylele 2018-03-05 11:09:20 +02:00
parent 1d419bac1b
commit c2515ff39d
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/video_core/renderer_opengl/gl_rasterizer.cpp
View file

@ -1065,7 +1065,8 @@ bool RasterizerOpenGL::AccelerateTextureCopy(const GPU::Regs::DisplayTransferCon
} }
if (output_gap != 0 && if (output_gap != 0 &&
(output_width != src_surface->BytesInPixels(src_rect.GetWidth() / src_surface->res_scale) * (output_width !=
src_surface->BytesInPixels(src_rect.GetWidth() / src_surface->res_scale) *
(src_surface->is_tiled ? 8 : 1) || (src_surface->is_tiled ? 8 : 1) ||
output_gap % src_surface->BytesInPixels(src_surface->is_tiled ? 64 : 1) != 0)) { output_gap % src_surface->BytesInPixels(src_surface->is_tiled ? 64 : 1) != 0)) {
return false; return false;
@ -1074,8 +1075,9 @@ bool RasterizerOpenGL::AccelerateTextureCopy(const GPU::Regs::DisplayTransferCon
SurfaceParams dst_params = *src_surface; SurfaceParams dst_params = *src_surface;
dst_params.addr = config.GetPhysicalOutputAddress(); dst_params.addr = config.GetPhysicalOutputAddress();
dst_params.width = src_rect.GetWidth() / src_surface->res_scale; dst_params.width = src_rect.GetWidth() / src_surface->res_scale;
dst_params.stride = dst_params.width + src_surface->PixelsInBytes( dst_params.stride =
src_surface->is_tiled ? output_gap / 8 : output_gap); dst_params.width +
src_surface->PixelsInBytes(src_surface->is_tiled ? output_gap / 8 : output_gap);
dst_params.height = src_rect.GetHeight() / src_surface->res_scale; dst_params.height = src_rect.GetHeight() / src_surface->res_scale;
dst_params.res_scale = src_surface->res_scale; dst_params.res_scale = src_surface->res_scale;
dst_params.UpdateParams(); dst_params.UpdateParams();
@ -1394,8 +1396,7 @@ void RasterizerOpenGL::SyncBlendColor() {
void RasterizerOpenGL::SyncFogColor() { void RasterizerOpenGL::SyncFogColor() {
const auto& regs = Pica::g_state.regs; const auto& regs = Pica::g_state.regs;
uniform_block_data.data.fog_color = { uniform_block_data.data.fog_color = {
regs.texturing.fog_color.r.Value() / 255.0f, regs.texturing.fog_color.r.Value() / 255.0f, regs.texturing.fog_color.g.Value() / 255.0f,
regs.texturing.fog_color.g.Value() / 255.0f,
regs.texturing.fog_color.b.Value() / 255.0f, regs.texturing.fog_color.b.Value() / 255.0f,
}; };
uniform_block_data.dirty = true; uniform_block_data.dirty = true;
@ -1423,8 +1424,7 @@ void RasterizerOpenGL::SyncProcTexNoise() {
Pica::float16::FromRaw(regs.proctex_noise_frequency.v).ToFloat32(), Pica::float16::FromRaw(regs.proctex_noise_frequency.v).ToFloat32(),
}; };
uniform_block_data.data.proctex_noise_a = { uniform_block_data.data.proctex_noise_a = {
regs.proctex_noise_u.amplitude / 4095.0f, regs.proctex_noise_u.amplitude / 4095.0f, regs.proctex_noise_v.amplitude / 4095.0f,
regs.proctex_noise_v.amplitude / 4095.0f,
}; };
uniform_block_data.data.proctex_noise_p = { uniform_block_data.data.proctex_noise_p = {
Pica::float16::FromRaw(regs.proctex_noise_u.phase).ToFloat32(), Pica::float16::FromRaw(regs.proctex_noise_u.phase).ToFloat32(),