Skip to content

feat: tweak binding logic for r_program #549

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
pollend wants to merge 1 commit into from
Closed

feat: tweak binding logic for r_program #549

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion source/ref_nri/r_descriptor_pool.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ void DetachDescriptorSlot( struct DescriptorSetAllocator *alloc, struct descript
}
}

struct descriptor_set_result_s ResolveDescriptorSet( struct RIDevice_s *device, struct DescriptorSetAllocator *alloc, uint32_t frameCount, uint32_t hash )
struct descriptor_set_result_s ResolveDescriptorSet( struct RIDevice_s *device, struct DescriptorSetAllocator *alloc, uint32_t frameCount, hash_t hash )
{
struct descriptor_set_result_s result = { 0 };
const size_t hashIndex = hash % ALLOC_HASH_RESERVE;
Expand Down
4 changes: 2 additions & 2 deletions source/ref_nri/r_descriptor_pool.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#define DESCRIPTOR_RESERVED_SIZE 64

struct descriptor_set_slot_s {
uint32_t hash;
hash_t hash;
uint32_t frameCount;
// queue
struct descriptor_set_slot_s *quNext;
Expand Down Expand Up @@ -70,7 +70,7 @@ struct descriptor_set_result_s {
struct descriptor_set_result_s ResolveDescriptorSet( struct RIDevice_s *device,
struct DescriptorSetAllocator *alloc,
uint32_t frameCount,
uint32_t hash );
hash_t hash );
void FreeDescriptorSetAlloc( struct RIDevice_s *device, struct DescriptorSetAllocator *alloc );

// utility
Expand Down
40 changes: 25 additions & 15 deletions source/ref_nri/r_program.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1197,29 +1197,37 @@ void RP_BindDescriptorSets( struct RIDevice_s *device, struct FrameState_s *cmd,
TracyCZoneN( ctx, "RP_BindDescriptorSets", 1 );
#if ( DEVICE_IMPL_VULKAN )
{
size_t numWrites = 0;
VkWriteDescriptorSet descriptorWrite[32]; // write 32 descriptors at once
VkDescriptorSet setsToBind[R_DESCRIPTOR_SET_MAX] = { VK_NULL_HANDLE };
uint32_t firstSetToBind = 0;
uint32_t setsToBindCount = 0;

for( uint32_t setIndex = 0; setIndex < R_DESCRIPTOR_SET_MAX; setIndex++ ) {
hash_t hash = HASH_INITIAL_VALUE;
for( size_t i = 0; i < numDescriptorData; i++ ) {
const struct descriptor_reflection_s *refl = __ReflectDescriptorSet( program, &bindings[i].handle );
if( !refl || setIndex != refl->set || RI_IsEmptyDescriptor( &bindings[i].descriptor ) )
continue;
hash = hash_u64( hash, refl->hash );
assert(bindings[i].descriptor.cookie != 0); // the cookie can't be 0
hash = hash_u64(hash, bindings[i].registerOffset);
assert( bindings[i].descriptor.cookie != 0 );
hash = hash_u64( hash, bindings[i].descriptor.cookie );
}
if( hash == HASH_INITIAL_VALUE )
if( hash == HASH_INITIAL_VALUE )
continue;
struct glsl_program_descriptor_s *info = &program->programDescriptors[setIndex];
struct descriptor_set_result_s result = ResolveDescriptorSet( &rsh.device, &info->alloc, rsh.frameSetCount, hash );
if( !result.found ) {
size_t numWrites = 0;
VkWriteDescriptorSet descriptorWrite[32];
for( size_t i = 0; i < numDescriptorData; i++ ) {
const struct descriptor_reflection_s *refl = __ReflectDescriptorSet( program, &bindings[i].handle );
if( !refl || setIndex != refl->set || RI_IsEmptyDescriptor( &bindings[i].descriptor ) )
continue;

assert( numWrites < Q_ARRAY_COUNT( descriptorWrite ) );
if( numWrites == Q_ARRAY_COUNT( descriptorWrite ) ) {
vkUpdateDescriptorSets( device->vk.device, numWrites, descriptorWrite, 0, NULL );
numWrites = 0;
}
VkWriteDescriptorSet *vkDesc = descriptorWrite + ( numWrites++ );
memset( vkDesc, 0, sizeof( VkWriteDescriptorSet ) );
vkDesc->sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET;
Expand All @@ -1244,21 +1252,23 @@ void RP_BindDescriptorSets( struct RIDevice_s *device, struct FrameState_s *cmd,
vkDesc->pImageInfo = &bindings[i].descriptor.vk.image;
break;
default:
assert( false ); // this is bad
assert( false );
break;
}

if( numWrites >= Q_ARRAY_COUNT( descriptorWrite ) ) {
vkUpdateDescriptorSets( device->vk.device, numWrites, descriptorWrite, 0, NULL );
numWrites = 0;
}
}
if( numWrites > 0 ) {
vkUpdateDescriptorSets( device->vk.device, numWrites, descriptorWrite, 0, NULL );
}
}

if( setsToBindCount == 0 ) {
firstSetToBind = setIndex;
}
VkDescriptorSet vkDescriptorSet = result.set->vk.handle;
vkCmdBindDescriptorSets( cmd->handle.vk.cmd, VK_PIPELINE_BIND_POINT_GRAPHICS, program->vk.pipelineLayout, setIndex, 1, &vkDescriptorSet, 0, NULL );
setsToBind[setsToBindCount++] = result.set->vk.handle;
}
if( numWrites > 0 ) {
vkUpdateDescriptorSets( device->vk.device, numWrites, descriptorWrite, 0, NULL );
if( setsToBindCount > 0 ) {
vkCmdBindDescriptorSets( cmd->handle.vk.cmd, VK_PIPELINE_BIND_POINT_GRAPHICS,
program->vk.pipelineLayout, firstSetToBind, setsToBindCount, setsToBind, 0, NULL );
}
}
#endif
Expand Down
Loading