Skip to content

[webgpu] Unknown (undefined) features cause undefined to i32 array writes #22771

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

Merged
kainino0x merged 1 commit into from
Oct 25, 2024
Merged

[webgpu] Unknown (undefined) features cause undefined to i32 array writes #22771

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
44 changes: 26 additions & 18 deletions src/library_webgpu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -822,16 +822,20 @@ var LibraryWebGPU = {
// wgpuDevice

wgpuDeviceEnumerateFeatures: (deviceId, featuresOutPtr) => {
var offset = 0;
var numFeatures = 0;
var device = WebGPU.mgrDevice.get(deviceId);
if (featuresOutPtr !== 0) {
var offset = 0;
device.features.forEach(feature => {
var featureEnumValue = WebGPU.FeatureNameString2Enum[feature];
{{{ makeSetValue('featuresOutPtr', 'offset', 'featureEnumValue', 'i32') }}};
offset += 4;
});
}
return device.features.size;
device.features.forEach(feature => {
var featureEnumValue = WebGPU.FeatureNameString2Enum[feature];
if (featureEnumValue !== undefined) {
if (featuresOutPtr !== 0) {
{{{ makeSetValue('featuresOutPtr', 'offset', 'featureEnumValue', 'i32') }}};
offset += 4;
}
numFeatures++;
}
});
return numFeatures;
},

wgpuDeviceDestroy: (deviceId) => WebGPU.mgrDevice.get(deviceId).destroy(),
Expand Down Expand Up @@ -2568,16 +2572,20 @@ var LibraryWebGPU = {
// WGPUAdapter

wgpuAdapterEnumerateFeatures: (adapterId, featuresOutPtr) => {
var offset = 0;
var numFeatures = 0;
var adapter = WebGPU.mgrAdapter.get(adapterId);
if (featuresOutPtr !== 0) {
var offset = 0;
adapter.features.forEach(feature => {
var featureEnumValue = WebGPU.FeatureNameString2Enum[feature];
{{{ makeSetValue('featuresOutPtr', 'offset', 'featureEnumValue', 'i32') }}};
offset += 4;
});
}
return adapter.features.size;
adapter.features.forEach(feature => {
var featureEnumValue = WebGPU.FeatureNameString2Enum[feature];
if (featureEnumValue !== undefined) {
if (featuresOutPtr !== 0) {
{{{ makeSetValue('featuresOutPtr', 'offset', 'featureEnumValue', 'i32') }}};
offset += 4;
}
numFeatures++;
}
});
return numFeatures;
},

wgpuAdapterGetInfo__deps: ['$stringToNewUTF8'],
Expand Down