octo/citra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

video_core: Fix some struct formatting

Browse Source
This commit is contained in:
GPUCode
2023-02-10 16:14:18 +02:00
parent 612647f94f
commit d9ed4600ca
1 changed files with 33 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/video_core/rasterizer_cache/rasterizer_cache.h
View File

@ -134,23 +134,25 @@ bool RasterizerCache<T>::BlitSurfaces(const Surface& src_surface, Common::Rectan
// 2. No flipping (if the bottom value is bigger than the top this indicates texture flip) // 2. No flipping (if the bottom value is bigger than the top this indicates texture flip)
if (src_rect.GetWidth() == dst_rect.GetWidth() && if (src_rect.GetWidth() == dst_rect.GetWidth() &&
src_rect.GetHeight() == dst_rect.GetHeight() && src_rect.bottom < src_rect.top) { src_rect.GetHeight() == dst_rect.GetHeight() && src_rect.bottom < src_rect.top) {
const TextureCopy texture_copy = {.src_level = 0, const TextureCopy texture_copy = {
.src_level = 0,
.dst_level = 0, .dst_level = 0,
.src_layer = 0, .src_layer = 0,
.dst_layer = 0, .dst_layer = 0,
.src_offset = {src_rect.left, src_rect.bottom}, .src_offset = {src_rect.left, src_rect.bottom},
.dst_offset = {dst_rect.left, dst_rect.bottom}, .dst_offset = {dst_rect.left, dst_rect.bottom},
.extent = {src_rect.GetWidth(), src_rect.GetHeight()}}; .extent = {src_rect.GetWidth(), src_rect.GetHeight()},
};
return runtime.CopyTextures(*src_surface, *dst_surface, texture_copy); return runtime.CopyTextures(*src_surface, *dst_surface, texture_copy);
} else { } else {
const TextureBlit texture_blit = {.src_level = 0, const TextureBlit texture_blit = {
.src_level = 0,
.dst_level = 0, .dst_level = 0,
.src_layer = 0, .src_layer = 0,
.dst_layer = 0, .dst_layer = 0,
.src_rect = src_rect, .src_rect = src_rect,
.dst_rect = dst_rect}; .dst_rect = dst_rect,
};
return runtime.BlitTextures(*src_surface, *dst_surface, texture_blit); return runtime.BlitTextures(*src_surface, *dst_surface, texture_blit);
} }
} }
@ -185,14 +187,14 @@ void RasterizerCache<T>::CopySurface(const Surface& src_surface, const Surface&
} }
if (src_surface->CanSubRect(subrect_params)) { if (src_surface->CanSubRect(subrect_params)) {
const TextureBlit texture_blit = {.src_level = 0, const TextureBlit texture_blit = {
.src_level = 0,
.dst_level = 0, .dst_level = 0,
.src_layer = 0, .src_layer = 0,
.dst_layer = 0, .dst_layer = 0,
.src_rect = src_surface->GetScaledSubRect(subrect_params), .src_rect = src_surface->GetScaledSubRect(subrect_params),
.dst_rect = .dst_rect = dst_surface->GetScaledSubRect(subrect_params),
dst_surface->GetScaledSubRect(subrect_params)}; };
runtime.BlitTextures(*src_surface, *dst_surface, texture_blit); runtime.BlitTextures(*src_surface, *dst_surface, texture_blit);
return; return;
} }
@ -482,13 +484,14 @@ auto RasterizerCache<T>::GetTextureCube(const TextureCubeConfig& config) -> cons
ValidateSurface(face, face->addr, face->size); ValidateSurface(face, face->addr, face->size);
} }
const TextureBlit texture_blit = {.src_level = 0, const TextureBlit texture_blit = {
.src_level = 0,
.dst_level = 0, .dst_level = 0,
.src_layer = 0, .src_layer = 0,
.dst_layer = static_cast<u32>(i), .dst_layer = static_cast<u32>(i),
.src_rect = face->GetScaledRect(), .src_rect = face->GetScaledRect(),
.dst_rect = Rect2D{0, scaled_size, scaled_size, 0}}; .dst_rect = Rect2D{0, scaled_size, scaled_size, 0},
};
runtime.BlitTextures(*face, *cube, texture_blit); runtime.BlitTextures(*face, *cube, texture_blit);
watcher->Validate(); watcher->Validate();
} }