Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-21 19:42:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #98612 from DarioSamo/alignment-transfer-fix

Browse Source 
Fix transfer alignment on initial texture transfer.
This commit is contained in:
Thaddeus Crews 2024-10-29 19:25:46 -05:00
commit 7a661eaa7c
No known key found for this signature in database
GPG Key ID: 62181B86FE9E5D84
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
servers/rendering/rendering_device.cpp
View File

@ -1260,8 +1260,6 @@ Error RenderingDevice::_texture_initialize(RID p_texture, uint32_t p_layer, cons
write_ptr = driver->buffer_map(transfer_worker->staging_buffer); write_ptr = driver->buffer_map(transfer_worker->staging_buffer);
ERR_FAIL_NULL_V(write_ptr, ERR_CANT_CREATE); ERR_FAIL_NULL_V(write_ptr, ERR_CANT_CREATE);
write_ptr += staging_worker_offset;
if (driver->api_trait_get(RDD::API_TRAIT_HONORS_PIPELINE_BARRIERS)) { if (driver->api_trait_get(RDD::API_TRAIT_HONORS_PIPELINE_BARRIERS)) {
// Transition the texture to the optimal layout. // Transition the texture to the optimal layout.
RDD::TextureBarrier tb; RDD::TextureBarrier tb;
@ -1303,11 +1301,12 @@ Error RenderingDevice::_texture_initialize(RID p_texture, uint32_t p_layer, cons
if (copy_pass) { if (copy_pass) {
const uint8_t *read_ptr_mipmap_layer = read_ptr_mipmap + (tight_mip_size / depth) * z; const uint8_t *read_ptr_mipmap_layer = read_ptr_mipmap + (tight_mip_size / depth) * z;
_copy_region_block_or_regular(read_ptr_mipmap_layer, write_ptr, 0, 0, width, width, height, block_w, block_h, pitch, pixel_size, block_size); uint64_t staging_buffer_offset = staging_worker_offset + staging_local_offset;
write_ptr += to_allocate; uint8_t *write_ptr_mipmap_layer = write_ptr + staging_buffer_offset;
_copy_region_block_or_regular(read_ptr_mipmap_layer, write_ptr_mipmap_layer, 0, 0, width, width, height, block_w, block_h, pitch, pixel_size, block_size);
RDD::BufferTextureCopyRegion copy_region; RDD::BufferTextureCopyRegion copy_region;
copy_region.buffer_offset = staging_worker_offset + staging_local_offset; copy_region.buffer_offset = staging_buffer_offset;
copy_region.texture_subresources.aspect = texture->read_aspect_flags; copy_region.texture_subresources.aspect = texture->read_aspect_flags;
copy_region.texture_subresources.mipmap = mm_i; copy_region.texture_subresources.mipmap = mm_i;
copy_region.texture_subresources.base_layer = p_layer; copy_region.texture_subresources.base_layer = p_layer;