Merge "vulkan/opengl: rename some vars and comments"
diff --git a/opengl/libs/EGL/egl_platform_entries.cpp b/opengl/libs/EGL/egl_platform_entries.cpp
index a3bb6de..188d3ae 100644
--- a/opengl/libs/EGL/egl_platform_entries.cpp
+++ b/opengl/libs/EGL/egl_platform_entries.cpp
@@ -98,7 +98,7 @@
"EGL_EXT_surface_CTA861_3_metadata "
;
-// Whitelist of extensions exposed to applications if implemented in the vendor driver.
+// Allowed list of extensions exposed to applications if implemented in the vendor driver.
char const * const gExtensionString =
"EGL_KHR_image " // mandatory
"EGL_KHR_image_base " // mandatory
diff --git a/vulkan/libvulkan/code-generator.tmpl b/vulkan/libvulkan/code-generator.tmpl
index a5a0405..f3e6ebd 100644
--- a/vulkan/libvulkan/code-generator.tmpl
+++ b/vulkan/libvulkan/code-generator.tmpl
@@ -1137,7 +1137,7 @@
{{if not (GetAnnotation $ "pfn")}}
{{$ext := GetAnnotation $ "extension"}}
{{if not $ext}}true
- {{else if not (Macro "IsExtensionBlacklisted" $ext)}}true
+ {{else if not (Macro "IsExtensionBlocked" $ext)}}true
{{end}}
{{end}}
{{end}}
@@ -1168,7 +1168,7 @@
Emit "true" if an extension is unsupportable on Android.
------------------------------------------------------------------------------
*/}}
-{{define "IsExtensionBlacklisted"}}
+{{define "IsExtensionBlocked"}}
{{$ext := index $.Arguments 0}}
{{ if eq $ext "VK_KHR_display"}}true
{{else if eq $ext "VK_KHR_display_swapchain"}}true