[webgpu][headers] Other minor fixes to reduce header diff.
- Fixes misnamed argument in RequestDevice.
- Fixes some default float values to look the same.
Change-Id: I9f4873567f202b73e682babfefc86148f132ce0e
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/247537
Reviewed-by: Kai Ninomiya <kainino@chromium.org>
Commit-Queue: Loko Kung <lokokung@google.com>
diff --git a/generator/templates/art/api_kotlin_types.kt b/generator/templates/art/api_kotlin_types.kt
index 3fc5c86..3134c65 100644
--- a/generator/templates/art/api_kotlin_types.kt
+++ b/generator/templates/art/api_kotlin_types.kt
@@ -91,6 +91,9 @@
{%- set ns = namespace(type_name='', default_value=default_value) -%}
{%- if type.name.get() == 'float' -%}
{%- set ns.type_name = 'Float' -%}
+ {%- if ns.default_value -%}
+ {%- set ns.default_value = "%.1ff"|format(ns.default_value[:-1]|float) -%}
+ {%- endif -%}
{%- elif type.name.get() == 'double' -%}
{%- set ns.type_name = 'Double' -%}
{%- elif type.name.get() in ['int8_t', 'uint8_t'] -%}
diff --git a/src/dawn/dawn.json b/src/dawn/dawn.json
index dd1b784..a98f11c 100644
--- a/src/dawn/dawn.json
+++ b/src/dawn/dawn.json
@@ -162,7 +162,7 @@
"name": "request device",
"returns": "future",
"args": [
- {"name": "options", "type": "device descriptor", "annotation": "const*", "optional": true, "no_default": true},
+ {"name": "descriptor", "type": "device descriptor", "annotation": "const*", "optional": true, "no_default": true},
{"name": "callback info", "type": "request device callback info"}
]
},
@@ -3366,8 +3366,8 @@
{"name": "stencil read mask", "type": "uint32_t", "default": "0xFFFFFFFF"},
{"name": "stencil write mask", "type": "uint32_t", "default": "0xFFFFFFFF"},
{"name": "depth bias", "type": "int32_t", "default": "0"},
- {"name": "depth bias slope scale", "type": "float", "default": "0.0f"},
- {"name": "depth bias clamp", "type": "float", "default": "0.0f"}
+ {"name": "depth bias slope scale", "type": "float", "default": "0.f"},
+ {"name": "depth bias clamp", "type": "float", "default": "0.f"}
]
},
@@ -3457,8 +3457,8 @@
{"name": "mag filter", "type": "filter mode", "default": "nearest"},
{"name": "min filter", "type": "filter mode", "default": "nearest"},
{"name": "mipmap filter", "type": "mipmap filter mode", "default": "nearest"},
- {"name": "lod min clamp", "type": "float", "default": "0.0f"},
- {"name": "lod max clamp", "type": "float", "default": "32.0f"},
+ {"name": "lod min clamp", "type": "float", "default": "0.f"},
+ {"name": "lod max clamp", "type": "float", "default": "32.f"},
{"name": "compare", "type": "compare function"},
{"name": "max anisotropy", "type": "uint16_t", "default": "1"}
]
diff --git a/third_party/webgpu-headers/webgpu.h.diff b/third_party/webgpu-headers/webgpu.h.diff
index 7e5e5e3..deaf360 100644
--- a/third_party/webgpu-headers/webgpu.h.diff
+++ b/third_party/webgpu-headers/webgpu.h.diff
@@ -147,33 +147,22 @@
/*.cullMode=*/WGPUCullMode_Undefined _wgpu_COMMA \
/*.unclippedDepth=*/WGPU_FALSE _wgpu_COMMA \
@@
- /*.magFilter=*/WGPUFilterMode_Undefined _wgpu_COMMA \
- /*.minFilter=*/WGPUFilterMode_Undefined _wgpu_COMMA \
- /*.mipmapFilter=*/WGPUMipmapFilterMode_Undefined _wgpu_COMMA \
-- /*.lodMinClamp=*/0.f _wgpu_COMMA \
-- /*.lodMaxClamp=*/32.f _wgpu_COMMA \
-+ /*.lodMinClamp=*/0.0f _wgpu_COMMA \
-+ /*.lodMaxClamp=*/32.0f _wgpu_COMMA \
- /*.compare=*/WGPUCompareFunction_Undefined _wgpu_COMMA \
- /*.maxAnisotropy=*/1 _wgpu_COMMA \
+ /*.features=*/NULL _wgpu_COMMA \
})
-@@
- } WGPUSupportedFeatures WGPU_STRUCTURE_ATTRIBUTE;
- #define WGPU_SUPPORTED_FEATURES_INIT _wgpu_MAKE_INIT_STRUCT(WGPUSupportedFeatures, { \
-- /*.featureCount=*/0 _wgpu_COMMA \
-- /*.features=*/NULL _wgpu_COMMA \
--})
--
-typedef struct WGPUSupportedInstanceFeatures {
- size_t featureCount;
- WGPUInstanceFeatureName const * features;
-} WGPUSupportedInstanceFeatures WGPU_STRUCTURE_ATTRIBUTE;
-
-#define WGPU_SUPPORTED_INSTANCE_FEATURES_INIT _wgpu_MAKE_INIT_STRUCT(WGPUSupportedInstanceFeatures, { \
- /*.featureCount=*/0 _wgpu_COMMA \
- /*.features=*/NULL _wgpu_COMMA \
- })
+- /*.featureCount=*/0 _wgpu_COMMA \
+- /*.features=*/NULL _wgpu_COMMA \
+-})
+-
+ typedef struct WGPUSupportedWGSLLanguageFeatures {
+ size_t featureCount;
+ WGPUWGSLLanguageFeatureName const * features;
@@
/*.sampleType=*/WGPUTextureSampleType_Undefined _wgpu_COMMA \
/*.viewDimension=*/WGPUTextureViewDimension_Undefined _wgpu_COMMA \
@@ -203,15 +192,6 @@
/*.stencilFront=*/WGPU_STENCIL_FACE_STATE_INIT _wgpu_COMMA \
/*.stencilBack=*/WGPU_STENCIL_FACE_STATE_INIT _wgpu_COMMA \
/*.stencilReadMask=*/0xFFFFFFFF _wgpu_COMMA \
- /*.stencilWriteMask=*/0xFFFFFFFF _wgpu_COMMA \
- /*.depthBias=*/0 _wgpu_COMMA \
-- /*.depthBiasSlopeScale=*/0.f _wgpu_COMMA \
-- /*.depthBiasClamp=*/0.f _wgpu_COMMA \
-+ /*.depthBiasSlopeScale=*/0.0f _wgpu_COMMA \
-+ /*.depthBiasClamp=*/0.0f _wgpu_COMMA \
- })
-
- typedef struct WGPUDeviceDescriptor {
@@
typedef struct WGPUInstanceDescriptor {
@@ -284,13 +264,6 @@
typedef void (*WGPUProcAdapterGetFeatures)(WGPUAdapter adapter, WGPUSupportedFeatures * features) WGPU_FUNCTION_ATTRIBUTE;
typedef WGPUStatus (*WGPUProcAdapterGetInfo)(WGPUAdapter adapter, WGPUAdapterInfo * info) WGPU_FUNCTION_ATTRIBUTE;
- typedef WGPUStatus (*WGPUProcAdapterGetLimits)(WGPUAdapter adapter, WGPULimits * limits) WGPU_FUNCTION_ATTRIBUTE;
- typedef WGPUBool (*WGPUProcAdapterHasFeature)(WGPUAdapter adapter, WGPUFeatureName feature) WGPU_FUNCTION_ATTRIBUTE;
--typedef WGPUFuture (*WGPUProcAdapterRequestDevice)(WGPUAdapter adapter, WGPU_NULLABLE WGPUDeviceDescriptor const * descriptor, WGPURequestDeviceCallbackInfo callbackInfo) WGPU_FUNCTION_ATTRIBUTE;
-+typedef WGPUFuture (*WGPUProcAdapterRequestDevice)(WGPUAdapter adapter, WGPU_NULLABLE WGPUDeviceDescriptor const * options, WGPURequestDeviceCallbackInfo callbackInfo) WGPU_FUNCTION_ATTRIBUTE;
- typedef void (*WGPUProcAdapterAddRef)(WGPUAdapter adapter) WGPU_FUNCTION_ATTRIBUTE;
- typedef void (*WGPUProcAdapterRelease)(WGPUAdapter adapter) WGPU_FUNCTION_ATTRIBUTE;
-
@@
typedef WGPUBindGroup (*WGPUProcDeviceCreateBindGroup)(WGPUDevice device, WGPUBindGroupDescriptor const * descriptor) WGPU_FUNCTION_ATTRIBUTE;
@@ -355,14 +328,6 @@
WGPU_EXPORT WGPUProc wgpuGetProcAddress(WGPUStringView procName) WGPU_FUNCTION_ATTRIBUTE;
WGPU_EXPORT void wgpuAdapterGetFeatures(WGPUAdapter adapter, WGPUSupportedFeatures * features) WGPU_FUNCTION_ATTRIBUTE;
- WGPU_EXPORT WGPUStatus wgpuAdapterGetInfo(WGPUAdapter adapter, WGPUAdapterInfo * info) WGPU_FUNCTION_ATTRIBUTE;
- WGPU_EXPORT WGPUStatus wgpuAdapterGetLimits(WGPUAdapter adapter, WGPULimits * limits) WGPU_FUNCTION_ATTRIBUTE;
- WGPU_EXPORT WGPUBool wgpuAdapterHasFeature(WGPUAdapter adapter, WGPUFeatureName feature) WGPU_FUNCTION_ATTRIBUTE;
--WGPU_EXPORT WGPUFuture wgpuAdapterRequestDevice(WGPUAdapter adapter, WGPU_NULLABLE WGPUDeviceDescriptor const * descriptor, WGPURequestDeviceCallbackInfo callbackInfo) WGPU_FUNCTION_ATTRIBUTE;
-+WGPU_EXPORT WGPUFuture wgpuAdapterRequestDevice(WGPUAdapter adapter, WGPU_NULLABLE WGPUDeviceDescriptor const * options, WGPURequestDeviceCallbackInfo callbackInfo) WGPU_FUNCTION_ATTRIBUTE;
- WGPU_EXPORT void wgpuAdapterAddRef(WGPUAdapter adapter) WGPU_FUNCTION_ATTRIBUTE;
- WGPU_EXPORT void wgpuAdapterRelease(WGPUAdapter adapter) WGPU_FUNCTION_ATTRIBUTE;
-
@@
WGPU_EXPORT WGPUBindGroup wgpuDeviceCreateBindGroup(WGPUDevice device, WGPUBindGroupDescriptor const * descriptor) WGPU_FUNCTION_ATTRIBUTE;
