mirror of
https://github.com/yuzu-emu/yuzu.git
synced 2024-08-20 14:53:22 +02:00
texture_cache: Use siblings textures on Rebuild and fix possible error on blitting
This commit is contained in:
parent
4db28f72f6
commit
3dd7643214
@ -522,7 +522,7 @@ void TextureCacheOpenGL::ImageBlit(View& src_view, View& dst_view,
|
|||||||
|
|
||||||
glBlitFramebuffer(src_rect.left, src_rect.top, src_rect.right, src_rect.bottom, dst_rect.left,
|
glBlitFramebuffer(src_rect.left, src_rect.top, src_rect.right, src_rect.bottom, dst_rect.left,
|
||||||
dst_rect.top, dst_rect.right, dst_rect.bottom, buffers,
|
dst_rect.top, dst_rect.right, dst_rect.bottom, buffers,
|
||||||
is_linear ? GL_LINEAR : GL_NEAREST);
|
is_linear && (buffers == GL_COLOR_BUFFER_BIT) ? GL_LINEAR : GL_NEAREST);
|
||||||
}
|
}
|
||||||
|
|
||||||
void TextureCacheOpenGL::BufferCopy(Surface& src_surface, Surface& dst_surface) {
|
void TextureCacheOpenGL::BufferCopy(Surface& src_surface, Surface& dst_surface) {
|
||||||
|
@ -220,7 +220,6 @@ public:
|
|||||||
}
|
}
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
|
|
||||||
TextureCache(Core::System& system, VideoCore::RasterizerInterface& rasterizer)
|
TextureCache(Core::System& system, VideoCore::RasterizerInterface& rasterizer)
|
||||||
: system{system}, rasterizer{rasterizer} {
|
: system{system}, rasterizer{rasterizer} {
|
||||||
for (std::size_t i = 0; i < Tegra::Engines::Maxwell3D::Regs::NumRenderTargets; i++) {
|
for (std::size_t i = 0; i < Tegra::Engines::Maxwell3D::Regs::NumRenderTargets; i++) {
|
||||||
@ -233,6 +232,7 @@ protected:
|
|||||||
siblings_table[PixelFormat::Z32FS8] = PixelFormat::RG32F;
|
siblings_table[PixelFormat::Z32FS8] = PixelFormat::RG32F;
|
||||||
siblings_table[PixelFormat::R16F] = PixelFormat::Z16;
|
siblings_table[PixelFormat::R16F] = PixelFormat::Z16;
|
||||||
siblings_table[PixelFormat::R32F] = PixelFormat::Z32F;
|
siblings_table[PixelFormat::R32F] = PixelFormat::Z32F;
|
||||||
|
siblings_table[PixelFormat::RG32F] = PixelFormat::Z32FS8;
|
||||||
}
|
}
|
||||||
|
|
||||||
~TextureCache() = default;
|
~TextureCache() = default;
|
||||||
@ -385,15 +385,27 @@ private:
|
|||||||
* @param current_surface, the registered surface in the cache which we want to convert.
|
* @param current_surface, the registered surface in the cache which we want to convert.
|
||||||
* @param params, the new surface params which we'll use to recreate the surface.
|
* @param params, the new surface params which we'll use to recreate the surface.
|
||||||
**/
|
**/
|
||||||
std::pair<TSurface, TView> RebuildSurface(TSurface current_surface,
|
std::pair<TSurface, TView> RebuildSurface(TSurface current_surface, const SurfaceParams& params,
|
||||||
const SurfaceParams& params) {
|
bool is_render) {
|
||||||
const auto gpu_addr = current_surface->GetGpuAddr();
|
const auto gpu_addr = current_surface->GetGpuAddr();
|
||||||
TSurface new_surface = GetUncachedSurface(gpu_addr, params);
|
|
||||||
const auto& cr_params = current_surface->GetSurfaceParams();
|
const auto& cr_params = current_surface->GetSurfaceParams();
|
||||||
if (cr_params.type != params.type || (cr_params.component_type != params.component_type)) {
|
TSurface new_surface;
|
||||||
|
if (cr_params.pixel_format != params.pixel_format && !is_render &&
|
||||||
|
siblings_table[cr_params.pixel_format] == params.pixel_format) {
|
||||||
|
SurfaceParams new_params = params;
|
||||||
|
new_params.pixel_format = cr_params.pixel_format;
|
||||||
|
new_params.component_type = cr_params.component_type;
|
||||||
|
new_params.type = cr_params.type;
|
||||||
|
new_surface = GetUncachedSurface(gpu_addr, new_params);
|
||||||
|
} else {
|
||||||
|
new_surface = GetUncachedSurface(gpu_addr, params);
|
||||||
|
}
|
||||||
|
const auto& final_params = new_surface->GetSurfaceParams();
|
||||||
|
if (cr_params.type != final_params.type ||
|
||||||
|
(cr_params.component_type != final_params.component_type)) {
|
||||||
BufferCopy(current_surface, new_surface);
|
BufferCopy(current_surface, new_surface);
|
||||||
} else {
|
} else {
|
||||||
std::vector<CopyParams> bricks = current_surface->BreakDown(params);
|
std::vector<CopyParams> bricks = current_surface->BreakDown(final_params);
|
||||||
for (auto& brick : bricks) {
|
for (auto& brick : bricks) {
|
||||||
ImageCopy(current_surface, new_surface, brick);
|
ImageCopy(current_surface, new_surface, brick);
|
||||||
}
|
}
|
||||||
@ -426,7 +438,7 @@ private:
|
|||||||
if (!is_render && siblings_table[current_surface->GetFormat()] == params.pixel_format) {
|
if (!is_render && siblings_table[current_surface->GetFormat()] == params.pixel_format) {
|
||||||
return match_check();
|
return match_check();
|
||||||
}
|
}
|
||||||
return RebuildSurface(current_surface, params);
|
return RebuildSurface(current_surface, params, is_render);
|
||||||
}
|
}
|
||||||
return match_check();
|
return match_check();
|
||||||
}
|
}
|
||||||
@ -539,7 +551,7 @@ private:
|
|||||||
if (s_result == MatchStructureResult::FullMatch) {
|
if (s_result == MatchStructureResult::FullMatch) {
|
||||||
return ManageStructuralMatch(current_surface, params, is_render);
|
return ManageStructuralMatch(current_surface, params, is_render);
|
||||||
} else {
|
} else {
|
||||||
return RebuildSurface(current_surface, params);
|
return RebuildSurface(current_surface, params, is_render);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -599,7 +611,8 @@ private:
|
|||||||
new_params.width = wh;
|
new_params.width = wh;
|
||||||
new_params.height = hh;
|
new_params.height = hh;
|
||||||
new_params.pixel_format = params.pixel_format;
|
new_params.pixel_format = params.pixel_format;
|
||||||
std::pair<TSurface, TView> pair = RebuildSurface(current_surface, new_params);
|
std::pair<TSurface, TView> pair =
|
||||||
|
RebuildSurface(current_surface, new_params, is_render);
|
||||||
std::optional<TView> mirage_view =
|
std::optional<TView> mirage_view =
|
||||||
pair.first->EmplaceView(params, gpu_addr, candidate_size);
|
pair.first->EmplaceView(params, gpu_addr, candidate_size);
|
||||||
if (mirage_view)
|
if (mirage_view)
|
||||||
@ -616,7 +629,7 @@ private:
|
|||||||
}
|
}
|
||||||
// This is the case the texture is a part of the parent.
|
// This is the case the texture is a part of the parent.
|
||||||
if (current_surface->MatchesSubTexture(params, gpu_addr)) {
|
if (current_surface->MatchesSubTexture(params, gpu_addr)) {
|
||||||
return RebuildSurface(current_surface, params);
|
return RebuildSurface(current_surface, params, is_render);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
// If there are many overlaps, odds are they are subtextures of the candidate
|
// If there are many overlaps, odds are they are subtextures of the candidate
|
||||||
|
Loading…
Reference in New Issue
Block a user