Skip to content

Add more validation checks to wgpuSurfaceGetCapabilities #47

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

Open
Peter0x44 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add more validation checks to wgpuSurfaceGetCapabilities #47

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
40 changes: 40 additions & 0 deletions src/wgvk.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5691,6 +5691,46 @@ static inline VkColorSpaceKHR toVulkanColorSpace(WGPUPredefinedColorSpace wcsp,

WGPUStatus wgpuSurfaceGetCapabilities(WGPUSurface wgpuSurface, WGPUAdapter adapter, WGPUSurfaceCapabilities* capabilities){
ENTRY();
if(capabilities){
memset(capabilities, 0, sizeof(*capabilities));
}
if(wgpuSurface == NULL){
TRACELOG(WGPU_LOG_ERROR, "wgpuSurfaceGetCapabilities: surface is NULL");
EXIT();
return WGPUStatus_Error;
}
if(adapter == NULL){
TRACELOG(WGPU_LOG_ERROR, "wgpuSurfaceGetCapabilities: adapter is NULL");
if(wgpuSurface->device){
DeviceCallback(wgpuSurface->device, WGPUErrorType_Validation, STRVIEW("wgpuSurfaceGetCapabilities: adapter is NULL"));
}
EXIT();
return WGPUStatus_Error;
}
if(capabilities == NULL){
TRACELOG(WGPU_LOG_ERROR, "wgpuSurfaceGetCapabilities: capabilities is NULL");
if(wgpuSurface->device){
DeviceCallback(wgpuSurface->device, WGPUErrorType_Validation, STRVIEW("wgpuSurfaceGetCapabilities: capabilities is NULL"));
}
EXIT();
return WGPUStatus_Error;
}
if(wgpuSurface->surface == VK_NULL_HANDLE){
TRACELOG(WGPU_LOG_ERROR, "wgpuSurfaceGetCapabilities: surface handle is NULL");
if(wgpuSurface->device){
DeviceCallback(wgpuSurface->device, WGPUErrorType_Validation, STRVIEW("wgpuSurfaceGetCapabilities: surface is invalid"));
}
EXIT();
return WGPUStatus_Error;
}
if(adapter->physicalDevice == VK_NULL_HANDLE){
TRACELOG(WGPU_LOG_ERROR, "wgpuSurfaceGetCapabilities: adapter physical device is NULL");
if(wgpuSurface->device){
DeviceCallback(wgpuSurface->device, WGPUErrorType_Validation, STRVIEW("wgpuSurfaceGetCapabilities: adapter is invalid"));
}
EXIT();
return WGPUStatus_Error;
}
if(wgpuSurface->capabilityCache.formatCount){
*capabilities = wgpuSurface->capabilityCache;
return WGPUStatus_Success;
Expand Down
16 changes: 16 additions & 0 deletions tests/wgvk_unit_tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,22 @@ class WebGPUTest : public ::testing::Test {
}
};

TEST(WGPUApiValidation, SurfaceGetCapabilitiesRejectsNullArgsAndClearsOutput) {
WGPUSurfaceCapabilities caps = {};
caps.formatCount = 123;
caps.presentModeCount = 456;
caps.alphaModeCount = 789;
caps.formats = reinterpret_cast<WGPUTextureFormat*>(uintptr_t(0x1));

EXPECT_EQ(wgpuSurfaceGetCapabilities(nullptr, nullptr, &caps), WGPUStatus_Error);
EXPECT_EQ(caps.formatCount, 0u);
EXPECT_EQ(caps.presentModeCount, 0u);
EXPECT_EQ(caps.alphaModeCount, 0u);
EXPECT_EQ(caps.formats, nullptr);

EXPECT_EQ(wgpuSurfaceGetCapabilities(nullptr, nullptr, nullptr), WGPUStatus_Error);
}

TEST_F(WebGPUTest, BufferReferenceCounting) {
WGPUBufferDescriptor desc = {};
desc.size = 1024;
Expand Down
Loading