Skip to content

Fix LoadBindGroup/UnloadBindGroup refcounting #17

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
zeozeozeo wants to merge 1 commit into from
Closed

Fix LoadBindGroup/UnloadBindGroup refcounting #17

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
13 changes: 11 additions & 2 deletions src/backend_wgpu.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2785,8 +2785,17 @@ EntryPointSet getEntryPointsSPIRV(const uint32_t *shaderSourceSPIRV, uint32_t wo
}

void UnloadBindGroup(DescribedBindGroup *bg) {
free(bg->entries);
wgpuBindGroupRelease((WGPUBindGroup)bg->bindGroup);
if(bg->entries) {
for(size_t i = 0; i < bg->entryCount; ++i) {
if(bg->entries[i].buffer) wgpuBufferRelease((WGPUBuffer)bg->entries[i].buffer);
if(bg->entries[i].textureView) wgpuTextureViewRelease((WGPUTextureView)bg->entries[i].textureView);
if(bg->entries[i].sampler) wgpuSamplerRelease((WGPUSampler)bg->entries[i].sampler);
}
free(bg->entries);
}
if (bg->bindGroup) {
wgpuBindGroupRelease((WGPUBindGroup)bg->bindGroup);
}
}
void UnloadBindGroupLayout(DescribedBindGroupLayout *bglayout) {
free(bglayout->entries);
Expand Down
18 changes: 15 additions & 3 deletions src/raygpu.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2339,19 +2339,31 @@ DescribedBindGroup LoadBindGroup(const DescribedBindGroupLayout* bglayout, const
DescribedBindGroup ret = {0};
if(entryCount > 0){
ret.entries = (ResourceDescriptor*)RL_CALLOC(entryCount, sizeof(ResourceDescriptor));
memcpy(ret.entries, entries, entryCount * sizeof(ResourceDescriptor));
// memcpy(ret.entries, entries, entryCount * sizeof(ResourceDescriptor));

for(size_t i = 0; i < entryCount; ++i) {
ret.entries[i] = entries[i];

if(ret.entries[i].buffer) {
wgpuBufferAddRef((WGPUBuffer)ret.entries[i].buffer);
}
if(ret.entries[i].textureView) {
wgpuTextureViewAddRef((WGPUTextureView)ret.entries[i].textureView);
}
if(ret.entries[i].sampler) {
wgpuSamplerAddRef((WGPUSampler)ret.entries[i].sampler);
}
}
}
ret.entryCount = entryCount;
ret.layout = bglayout;

ret.needsUpdate = true;
ret.descriptorHash = 0;


for(uint32_t i = 0;i < ret.entryCount;i++){
ret.descriptorHash ^= bgEntryHash(ret.entries[i]);
}
//ret.bindGroup = wgpuDeviceCreateBindGroup((WGPUDevice)GetDevice(), &ret.desc);
return ret;
}

Expand Down