Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 90ff6087 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "vulkan/opengl: rename some vars and comments" am: 0360dae8 

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1369276

Change-Id: I5203f40b5c36df7ef60be9ea4b94fdcbf3b40eff
parents 3ee15513 0360dae8

opengl/libs/EGL/egl_platform_entries.cpp

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ char const * const gBuiltinExtensionString = 
        "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

vulkan/libvulkan/code-generator.tmpl

+2 −2
Original line number Diff line number Diff line
@@ -1137,7 +1137,7 @@ VK_KHR_bind_memory2 
  {{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 @@ VK_KHR_bind_memory2 
  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