Archive/rpcs3
0
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-04-28 13:28:01 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

gl: Implement support for texture1D decode

Browse source
This commit is contained in:
kd-11 2022-07-17 14:16:38 +03:00 • committed by kd-11
parent 6a3f17cd36
commit e12d268662
1 changed files with 24 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

28
rpcs3/Emu/RSX/GL/GLTexture.cpp
View file

@ -582,8 +582,7 @@ namespace gl
};
const auto caps = gl::get_driver_caps();
if (dst->get_target() != gl::texture::target::texture1D &&
(!(dst->aspect() & image_aspect::stencil) || caps.ARB_shader_stencil_export_supported))
if ((dst->aspect() & image_aspect::stencil) == 0 || caps.ARB_shader_stencil_export_supported)
{
// We do not need to use the driver's builtin transport mechanism
glMemoryBarrier(GL_SHADER_STORAGE_BARRIER_BIT);
@ -613,6 +612,16 @@ namespace gl
scratch_view = std::make_unique<gl::texture_view>(dst, GL_TEXTURE_2D, range);
break;
}
case texture::target::texture1D:
{
scratch = std::make_unique<gl::texture>(
GL_TEXTURE_2D,
image_region.x + image_region.width, 1, 1, 1,
static_cast<GLenum>(dst->get_internal_format()), dst->format_class());
scratch_view = std::make_unique<gl::nil_texture_view>(scratch.get());
break;
}
default:
{
ensure(dst->layers() == 1);
@ -655,15 +664,26 @@ namespace gl
gl::get_overlay_pass<gl::rp_ssbo_to_generic_texture>()->run(cmd, transfer_buf, scratch_view.get(), out_offset, image_region, unpack_info);
}
if (dst->get_target() == texture::target::texture3D)
switch (dst->get_target())
{
case texture::target::texture1D:
{
const position3u transfer_offset = { dst_region.position.x, 0, 0 };
g_hw_blitter->copy_image(cmd, scratch.get(), dst, 0, dst_level, transfer_offset, transfer_offset, { dst_region.width, 1, 1 });
break;
}
case texture::target::texture3D:
{
// Memcpy
for (u32 layer = dst_region.z, i = 0; i < dst_region.depth; ++i, ++layer)
{
const position3u src_offset = { dst_region.position.x, dst_region.position.y + (i * dst_region.height), 0 };
const position3u dst_offset = { dst_region.position.x, dst_region.position.y, layer };
g_hw_blitter->copy_image(cmd, scratch.get(), dst, 0, dst_level, src_offset, dst_offset, {dst_region.width, dst_region.height, 1});
g_hw_blitter->copy_image(cmd, scratch.get(), dst, 0, dst_level, src_offset, dst_offset, { dst_region.width, dst_region.height, 1 });
}
break;
}
default: break;
}
}
else