commit 654416e15bdd669b62f374d78a4c427a28c74b02
author Loko Kung <lokokung@google.com> Tue Apr 25 16:03:22 2023 +0000
committer Dawn LUCI CQ <dawn-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Apr 25 16:03:22 2023 +0000
tree f36962abdf1b95e2dab0966ccf7bd59cc7d0d0d7
parent 03f9f5f538121da7bc3c6175de9fd38fa2aaf0e0

Deprecation changes to rename some FilterMode enums to MipmapFilterMode.

Change-Id: I0df2677cfd454a2f38e580acd08089694486f6ac
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/128680
Reviewed-by: Austin Eng <enga@chromium.org>
Auto-Submit: Loko Kung <lokokung@google.com>
Kokoro: Kokoro <noreply+kokoro@google.com>
Reviewed-by: Kai Ninomiya <kainino@chromium.org>
Commit-Queue: Loko Kung <lokokung@google.com>

generator/templates/api.h

diff --git a/generator/templates/api.h b/generator/templates/api.h
index c4def22..679433a 100644
--- a/generator/templates/api.h
+++ b/generator/templates/api.h
@@ -69,6 +69,9 @@
     typedef enum {{as_cType(type.name)}} {
         {% for value in type.values %}
             {{as_cEnum(type.name, value.name)}} = 0x{{format(value.value, "08X")}},
+            {% if ("dawn" in enabled_tags) and (type == types["filter mode"]) %}
+                WGPUMipmapFilterMode_{{value.name.CamelCase()}} = 0x{{format(value.value, "08X")}},
+            {% endif %}
         {% endfor %}
         {{as_cEnum(type.name, Name("force32"))}} = 0x7FFFFFFF
     } {{as_cType(type.name)}};
@@ -78,6 +81,12 @@
 
 {% endfor -%}
 
+// Special case definition of MipmapFilterMode for Dawn side.
+// TODO(lokokung) Remove once Chromium side is updated.
+{% if 'dawn' in enabled_tags %}
+    typedef WGPUFilterMode WGPUMipmapFilterMode;
+{% endif %}
+
 typedef struct {{c_prefix}}ChainedStruct {
     struct {{c_prefix}}ChainedStruct const * next;
     {{c_prefix}}SType sType;

generator/templates/api_cpp.h

diff --git a/generator/templates/api_cpp.h b/generator/templates/api_cpp.h
index 2bd475e..280602b 100644
--- a/generator/templates/api_cpp.h
+++ b/generator/templates/api_cpp.h
@@ -49,6 +49,12 @@
 
     {% endfor %}
 
+    // Special case definition of MipmapFilterMode for Dawn side.
+    // TODO(lokokung) Remove once Chromium side is updated.
+    {% if 'dawn' in enabled_tags %}
+         using MipmapFilterMode = FilterMode;
+    {% endif %}
+
     {% for type in by_category["bitmask"] %}
         enum class {{as_cppType(type.name)}} : uint32_t {
             {% for value in type.values %}