summaryrefslogtreecommitdiffstats
path: root/src/video_core
diff options
context:
space:
mode:
authorameerj <52414509+ameerj@users.noreply.github.com>2021-11-17 00:19:47 +0100
committerameerj <52414509+ameerj@users.noreply.github.com>2021-11-17 04:31:58 +0100
commit35ca6274f4bee69dd76ff2aa165186b01594eaba (patch)
tree016cd3d21d4f84a3fe99fec5e2abfa49b3daeacf /src/video_core
parentMerge pull request #7219 from FernandoS27/aristotles-right-testicle (diff)
downloadyuzu-35ca6274f4bee69dd76ff2aa165186b01594eaba.tar
yuzu-35ca6274f4bee69dd76ff2aa165186b01594eaba.tar.gz
yuzu-35ca6274f4bee69dd76ff2aa165186b01594eaba.tar.bz2
yuzu-35ca6274f4bee69dd76ff2aa165186b01594eaba.tar.lz
yuzu-35ca6274f4bee69dd76ff2aa165186b01594eaba.tar.xz
yuzu-35ca6274f4bee69dd76ff2aa165186b01594eaba.tar.zst
yuzu-35ca6274f4bee69dd76ff2aa165186b01594eaba.zip
Diffstat (limited to 'src/video_core')
-rw-r--r--src/video_core/renderer_opengl/gl_texture_cache.cpp23
-rw-r--r--src/video_core/renderer_opengl/gl_texture_cache.h16
2 files changed, 18 insertions, 21 deletions
diff --git a/src/video_core/renderer_opengl/gl_texture_cache.cpp b/src/video_core/renderer_opengl/gl_texture_cache.cpp
index 2f7d98d8b..85a02d859 100644
--- a/src/video_core/renderer_opengl/gl_texture_cache.cpp
+++ b/src/video_core/renderer_opengl/gl_texture_cache.cpp
@@ -538,7 +538,7 @@ void TextureCacheRuntime::EmulateCopyImage(Image& dst, Image& src,
ASSERT(src.info.type == ImageType::e3D);
util_shaders.CopyBC4(dst, src, copies);
} else if (IsPixelFormatBGR(dst.info.format) || IsPixelFormatBGR(src.info.format)) {
- bgr_copy_pass.CopyBGR(dst, src, copies);
+ format_conversion_pass.ConvertImage(dst, src, copies);
} else {
UNREACHABLE();
}
@@ -1286,32 +1286,29 @@ Framebuffer::Framebuffer(TextureCacheRuntime& runtime, std::span<ImageView*, NUM
Framebuffer::~Framebuffer() = default;
-void BGRCopyPass::CopyBGR(Image& dst_image, Image& src_image,
- std::span<const VideoCommon::ImageCopy> copies) {
- static constexpr VideoCommon::Offset3D zero_offset{0, 0, 0};
+void FormatConversionPass::ConvertImage(Image& dst_image, Image& src_image,
+ std::span<const VideoCommon::ImageCopy> copies) {
const u32 img_bpp = BytesPerBlock(src_image.info.format);
for (const ImageCopy& copy : copies) {
- ASSERT(copy.src_offset == zero_offset);
- ASSERT(copy.dst_offset == zero_offset);
const u32 num_src_layers = static_cast<u32>(copy.src_subresource.num_layers);
const u32 copy_size = copy.extent.width * copy.extent.height * num_src_layers * img_bpp;
- if (bgr_pbo_size < copy_size) {
- bgr_pbo.Create();
- bgr_pbo_size = copy_size;
- glNamedBufferData(bgr_pbo.handle, bgr_pbo_size, nullptr, GL_STREAM_COPY);
+ if (pbo_size < copy_size) {
+ intermediate_pbo.Create();
+ pbo_size = copy_size;
+ glNamedBufferData(intermediate_pbo.handle, pbo_size, nullptr, GL_STREAM_COPY);
}
// Copy from source to PBO
glPixelStorei(GL_PACK_ALIGNMENT, 1);
glPixelStorei(GL_PACK_ROW_LENGTH, copy.extent.width);
- glBindBuffer(GL_PIXEL_PACK_BUFFER, bgr_pbo.handle);
+ glBindBuffer(GL_PIXEL_PACK_BUFFER, intermediate_pbo.handle);
glGetTextureSubImage(src_image.Handle(), 0, 0, 0, 0, copy.extent.width, copy.extent.height,
num_src_layers, src_image.GlFormat(), src_image.GlType(),
- static_cast<GLsizei>(bgr_pbo_size), nullptr);
+ static_cast<GLsizei>(pbo_size), nullptr);
// Copy from PBO to destination in desired GL format
glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
glPixelStorei(GL_UNPACK_ROW_LENGTH, copy.extent.width);
- glBindBuffer(GL_PIXEL_UNPACK_BUFFER, bgr_pbo.handle);
+ glBindBuffer(GL_PIXEL_UNPACK_BUFFER, intermediate_pbo.handle);
glTextureSubImage3D(dst_image.Handle(), 0, 0, 0, 0, copy.extent.width, copy.extent.height,
copy.dst_subresource.num_layers, dst_image.GlFormat(),
dst_image.GlType(), nullptr);
diff --git a/src/video_core/renderer_opengl/gl_texture_cache.h b/src/video_core/renderer_opengl/gl_texture_cache.h
index 1bb762568..b89c183a9 100644
--- a/src/video_core/renderer_opengl/gl_texture_cache.h
+++ b/src/video_core/renderer_opengl/gl_texture_cache.h
@@ -52,17 +52,17 @@ struct FormatProperties {
bool is_compressed;
};
-class BGRCopyPass {
+class FormatConversionPass {
public:
- BGRCopyPass() = default;
- ~BGRCopyPass() = default;
+ FormatConversionPass() = default;
+ ~FormatConversionPass() = default;
- void CopyBGR(Image& dst_image, Image& src_image,
- std::span<const VideoCommon::ImageCopy> copies);
+ void ConvertImage(Image& dst_image, Image& src_image,
+ std::span<const VideoCommon::ImageCopy> copies);
private:
- OGLBuffer bgr_pbo;
- size_t bgr_pbo_size{};
+ OGLBuffer intermediate_pbo;
+ size_t pbo_size{};
};
class TextureCacheRuntime {
@@ -144,7 +144,7 @@ private:
const Device& device;
StateTracker& state_tracker;
UtilShaders util_shaders;
- BGRCopyPass bgr_copy_pass;
+ FormatConversionPass format_conversion_pass;
std::array<std::unordered_map<GLenum, FormatProperties>, 3> format_properties;
bool has_broken_texture_view_formats = false;