Revert "vulkan: add EGL_ANGLE_platform_angle_vulkan_device_uuid"

This reverts commit 96abb2c. Reason for revert: breaks rolling into Chromium https://chromium-review.googlesource.com/c/chromium/src/+/6158098 Original change's description: > vulkan: add EGL_ANGLE_platform_angle_vulkan_device_uuid > > Implement the ability to select a specific device and driver combination > through a few new selection criteria: > > VkPhysicalDeviceIDProperties::deviceUUID > VkPhysicalDeviceIDProperties::driverUUID > VkPhysicalDeviceDriverProperties::driverID > > Bug: angleproject:351866412 > Change-Id: Ia6716aaed658d2563612d8b5d81287df97b57462 > Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/5686557 > Reviewed-by: Shahbaz Youssefi <[email protected]> > Auto-Submit: Steven Noonan <[email protected]> > Reviewed-by: Amirali Abdolrashidi <[email protected]> > Commit-Queue: Shahbaz Youssefi <[email protected]> Bug: angleproject:351866412 Change-Id: Ic7cf9dcf6a950556cc44f5920498db429c866340 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/6164164 Commit-Queue: Yuly Novikov <[email protected]> Bot-Commit: Rubber Stamper <[email protected]>
google · Jan 9, 2025 · 3b09226 · 3b09226
1 parent 1b068f6
commit 3b09226
Show file tree

Hide file tree

Showing 22 changed files with 65 additions and 766 deletions.
diff --git a/extensions/EGL_ANGLE_platform_angle_vulkan_device_uuid.txt b/extensions/EGL_ANGLE_platform_angle_vulkan_device_uuid.txt
diff --git a/include/EGL/eglext_angle.h b/include/EGL/eglext_angle.h
@@ -105,13 +105,6 @@
 #define EGL_PLATFORM_VULKAN_DISPLAY_MODE_HEADLESS_ANGLE 0x34A5
 #endif /* EGL_ANGLE_platform_angle_vulkan */
 
-#ifndef EGL_ANGLE_platform_angle_vulkan_device_uuid
-#define EGL_ANGLE_platform_angle_vulkan_device_uuid 1
-#define EGL_PLATFORM_ANGLE_VULKAN_DEVICE_UUID_ANGLE 0x34F0
-#define EGL_PLATFORM_ANGLE_VULKAN_DRIVER_UUID_ANGLE 0x34F1
-#define EGL_PLATFORM_ANGLE_VULKAN_DRIVER_ID_ANGLE 0x34F2
-#endif /* EGL_ANGLE_platform_angle_vulkan_device_uuid */
-
 #ifndef EGL_ANGLE_platform_angle_metal
 #define EGL_ANGLE_platform_angle_metal 1
 #define EGL_PLATFORM_ANGLE_TYPE_METAL_ANGLE 0x3489

diff --git a/scripts/code_generation_hashes/Extension_files.json b/scripts/code_generation_hashes/Extension_files.json
@@ -2,7 +2,7 @@
   "doc/ExtensionSupport.md":
     "9fedcc1a67af79d93c2da1105c9bada6",
   "scripts/egl_angle_ext.xml":
-    "63ccd7de2f7fde008f209087eba07a57",
+    "0a03416ded6719c24d8198f58f8ad0c6",
   "scripts/extension_data/intel_630_linux.json":
     "3b86832de6a7095f4617e273cba6d45e",
   "scripts/extension_data/intel_630_win10.json":

diff --git a/scripts/code_generation_hashes/GL_EGL_WGL_loader.json b/scripts/code_generation_hashes/GL_EGL_WGL_loader.json
@@ -1,6 +1,6 @@
 {
   "scripts/egl_angle_ext.xml":
-    "63ccd7de2f7fde008f209087eba07a57",
+    "0a03416ded6719c24d8198f58f8ad0c6",
   "scripts/generate_loader.py":
     "93c78a8d11323fa311fed5118fbcf083",
   "scripts/gl_angle_ext.xml":

diff --git a/scripts/code_generation_hashes/GL_EGL_entry_points.json b/scripts/code_generation_hashes/GL_EGL_entry_points.json
@@ -1,6 +1,6 @@
 {
   "scripts/egl_angle_ext.xml":
-    "63ccd7de2f7fde008f209087eba07a57",
+    "0a03416ded6719c24d8198f58f8ad0c6",
   "scripts/entry_point_packed_egl_enums.json":
     "a72ae855c6b403912103b519139951a1",
   "scripts/entry_point_packed_gl_enums.json":

diff --git a/scripts/code_generation_hashes/interpreter_utils.json b/scripts/code_generation_hashes/interpreter_utils.json
@@ -1,6 +1,6 @@
 {
   "scripts/egl_angle_ext.xml":
-    "63ccd7de2f7fde008f209087eba07a57",
+    "0a03416ded6719c24d8198f58f8ad0c6",
   "scripts/gen_interpreter_utils.py":
     "10ba16ee78604763fc883525dd275de8",
   "scripts/gl_angle_ext.xml":

diff --git a/scripts/code_generation_hashes/proc_table.json b/scripts/code_generation_hashes/proc_table.json
@@ -1,6 +1,6 @@
 {
   "scripts/egl_angle_ext.xml":
-    "63ccd7de2f7fde008f209087eba07a57",
+    "0a03416ded6719c24d8198f58f8ad0c6",
   "scripts/gen_proc_table.py":
     "240b4a4f4c9e9592c712cfbbdc6d4d35",
   "scripts/gl_angle_ext.xml":

diff --git a/scripts/egl_angle_ext.xml b/scripts/egl_angle_ext.xml
@@ -472,13 +472,6 @@
                 <enum name="EGL_PLATFORM_ANGLE_TYPE_VULKAN_ANGLE"/>
             </require>
         </extension>
-        <extension name="EGL_ANGLE_platform_angle_vulkan_device_uuid" supported="egl">
-            <require>
-                <enum name="EGL_PLATFORM_ANGLE_VULKAN_DEVICE_UUID_ANGLE"/>
-                <enum name="EGL_PLATFORM_ANGLE_VULKAN_DRIVER_UUID_ANGLE"/>
-                <enum name="EGL_PLATFORM_ANGLE_VULKAN_DRIVER_ID_ANGLE"/>
-            </require>
-        </extension>
         <extension name="EGL_ANGLE_robust_resource_initialization" supported="egl">
             <require>
                 <enum name="EGL_ROBUST_RESOURCE_INITIALIZATION_ANGLE"/>
@@ -669,11 +662,6 @@
         <enum value="0x34DE" name="EGL_SYNC_GLOBAL_FENCE_ANGLE"/>
         <enum value="0x34DF" name="EGL_PLATFORM_ANGLE_TYPE_WEBGPU_ANGLE"/>
     </enums>
-    <enums namespace="EGL" start="0x34F0" end="0x34FF" vendor="ANGLE">
-        <enum value="0x34F0" name="EGL_PLATFORM_ANGLE_VULKAN_DEVICE_UUID_ANGLE"/>
-        <enum value="0x34F1" name="EGL_PLATFORM_ANGLE_VULKAN_DRIVER_UUID_ANGLE"/>
-        <enum value="0x34F2" name="EGL_PLATFORM_ANGLE_VULKAN_DRIVER_ID_ANGLE"/>
-    </enums>
     <enums namespace="EGL" vendor="ANGLE">
         <enum value="0x0001" name="EGL_LOW_POWER_ANGLE"/>
         <enum value="0x0002" name="EGL_HIGH_POWER_ANGLE"/>