Edit

kc3-lang/angle/scripts/code_generation_hashes/GL_EGL_entry_points.json

Branch :

  • Show log

    Commit

  • Author : Brandon Schade
    Date : 2020-01-27 13:37:29
    Hash : 0a6e118d
    Message : Change g_Mutex from std::mutex to std::recursive_mutex When running flatland on android-10.0.0_r21 (Pixel 3), libgui's ~EglImage calls eglTerminate which grabs angle's EGL entry point mutex. The path continues to libvulkan where eventually another egl call happens (eglDestroyImageKHR) and it will attempt to take the mutex at the entry point again. So we try to get the mutex multiple times from the same thread. Change this mutex to a recursive_mutex to allow for this re-entry of EGL calls Tests: android-10.0.0_r21/frameworks/native/cmds/flatland Bug: angleproject:4354 Change-Id: If8a817df45e9f58d5f06884510350e17d7127fa9 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2029218 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Cody Northrop <cnorthrop@google.com>

  • scripts/code_generation_hashes/GL_EGL_entry_points.json
  • {
      "scripts/egl.xml":
        "842e24514c4cfe09fba703c17a0fd292",
      "scripts/egl_angle_ext.xml":
        "63f18dc9b7183ead4ddd3dfd1571973a",
      "scripts/entry_point_packed_gl_enums.json":
        "bcf97f16fd4cd4d4e50d66622982e67e",
      "scripts/generate_entry_points.py":
        "eb3d1f20c9f1657ef2bceb16e9b72326",
      "scripts/gl.xml":
        "2af7b077ec347349b3a92683e8fb8b03",
      "scripts/gl_angle_ext.xml":
        "d6907cd84d95ac0b32a164194eadcf53",
      "scripts/registry_xml.py":
        "1cf8c2638c7a2ea439f79d3ba05592bd",
      "scripts/wgl.xml":
        "aa96419c582af2f6673430e2847693f4",
      "src/libANGLE/Context_gl_1_0_autogen.h":
        "f2dd5fb880ca47ff1e5558a95a8ff407",
      "src/libANGLE/Context_gl_1_1_autogen.h":
        "84e4bd8f13ae8274ae9072d761afd043",
      "src/libANGLE/Context_gl_1_2_autogen.h":
        "d51eeadcb8d4824e01db4c3bdcd19c64",
      "src/libANGLE/Context_gl_1_3_autogen.h":
        "4a126b1d10a5af02676e5f74494535a4",
      "src/libANGLE/Context_gl_1_4_autogen.h":
        "eca01aa547e2f24d2caeb945f2bca9c9",
      "src/libANGLE/Context_gl_1_5_autogen.h":
        "35533281995d8b77d0f3e13dad3aa101",
      "src/libANGLE/Context_gl_2_0_autogen.h":
        "1208793161611291014912e5340c9b93",
      "src/libANGLE/Context_gl_2_1_autogen.h":
        "c1c72e57fcacc8bfd3ae9c3471d9e95a",
      "src/libANGLE/Context_gl_3_0_autogen.h":
        "19f4ee6e5c2496522eb597e845e6e435",
      "src/libANGLE/Context_gl_3_1_autogen.h":
        "d1d4f7055bc57ff391b8cd6ad25b9d10",
      "src/libANGLE/Context_gl_3_2_autogen.h":
        "83fba660b460665d296a29de1db5dcf6",
      "src/libANGLE/Context_gl_3_3_autogen.h":
        "6e8d776e94883ab254a5c37db1330754",
      "src/libANGLE/Context_gl_4_0_autogen.h":
        "b2f75358fc3845026d670e4af4809688",
      "src/libANGLE/Context_gl_4_1_autogen.h":
        "432580f798537a5ce77c57a075748ce1",
      "src/libANGLE/Context_gl_4_2_autogen.h":
        "6a77d507af0454802201ca553f06cc0b",
      "src/libANGLE/Context_gl_4_3_autogen.h":
        "fbc402c961d759be5e221a84a9cb5d65",
      "src/libANGLE/Context_gl_4_4_autogen.h":
        "27b04d8d3b1f7a2804d49b85627e78a9",
      "src/libANGLE/Context_gl_4_5_autogen.h":
        "5fca3d4373eae2cf930c33c479d719e6",
      "src/libANGLE/Context_gl_4_6_autogen.h":
        "738e344919d9a867e8823cbf52d10394",
      "src/libANGLE/Context_gles_1_0_autogen.h":
        "51fce95acbf8de72d21255adbbe0e8cd",
      "src/libANGLE/Context_gles_2_0_autogen.h":
        "aadd8e9112041745ccfc34fc9b7ddcdd",
      "src/libANGLE/Context_gles_3_0_autogen.h":
        "6df0461f281bb210a49eb5eded2ff3a6",
      "src/libANGLE/Context_gles_3_1_autogen.h":
        "ff68951308640c29acab78e0caa312f0",
      "src/libANGLE/Context_gles_3_2_autogen.h":
        "8ab4576d737d46e2ee666c26c01ae608",
      "src/libANGLE/Context_gles_ext_autogen.h":
        "d4d23031a26b698adc287504d9f14681",
      "src/libANGLE/capture_gles_1_0_autogen.cpp":
        "96fc0f501e2e696ab911dad8b400dfb2",
      "src/libANGLE/capture_gles_1_0_autogen.h":
        "546173090c85ad28a580ca76cd117484",
      "src/libANGLE/capture_gles_2_0_autogen.cpp":
        "a638d95098d94dde3af767edaa731e11",
      "src/libANGLE/capture_gles_2_0_autogen.h":
        "1d5f8b8d281c0ba80eccd0be0590ea17",
      "src/libANGLE/capture_gles_3_0_autogen.cpp":
        "109c08bb2247e5e293c1bb5259bd9724",
      "src/libANGLE/capture_gles_3_0_autogen.h":
        "09cb8286a16d3fc2255cb9dcc0c16236",
      "src/libANGLE/capture_gles_3_1_autogen.cpp":
        "92c3c9f7b62c937fd3595c2a1d1a9ce0",
      "src/libANGLE/capture_gles_3_1_autogen.h":
        "3ad016de2aad9095ad57073aa0fc9f9f",
      "src/libANGLE/capture_gles_3_2_autogen.cpp":
        "939dfca1b423b56cc74260dc623eb0f5",
      "src/libANGLE/capture_gles_3_2_autogen.h":
        "a7fa951e9296e927cd9bb197c51dc9a2",
      "src/libANGLE/capture_gles_ext_autogen.cpp":
        "e24130b78c56dd362587bb9e27fcaeee",
      "src/libANGLE/capture_gles_ext_autogen.h":
        "08281242dfb534b4297bb817b718f46a",
      "src/libANGLE/entry_points_enum_autogen.cpp":
        "0881562de1b624c73e9e0bda9fb843b5",
      "src/libANGLE/entry_points_enum_autogen.h":
        "44c5bd30e7fd0da55b805b9ea0409ac4",
      "src/libANGLE/frame_capture_replay_autogen.cpp":
        "bc3dc81d516e5eb3a331b4102d45f2a3",
      "src/libANGLE/frame_capture_utils_autogen.cpp":
        "32f055ef063856f7ac8d7d292eda5a75",
      "src/libANGLE/frame_capture_utils_autogen.h":
        "aeaac3bbf5888b5c6663e488ee3fd35e",
      "src/libANGLE/validationES1_autogen.h":
        "210ff28a4cfa11ef9e450ede0cabe48d",
      "src/libANGLE/validationES2_autogen.h":
        "f9f41f6d5820f5debb29fffc51537661",
      "src/libANGLE/validationES31_autogen.h":
        "06a7159a1d0604c00bbbcec22c8bd1c3",
      "src/libANGLE/validationES32_autogen.h":
        "b5774c85c47f3be1851c97006206ae3e",
      "src/libANGLE/validationES3_autogen.h":
        "f2cd4ac4be07a5bfed51a413e2967060",
      "src/libANGLE/validationESEXT_autogen.h":
        "fb4e9c39c031b7de1a354183e21f45cc",
      "src/libANGLE/validationGL11_autogen.h":
        "043a60940daa105730e2166f0a290e2f",
      "src/libANGLE/validationGL12_autogen.h":
        "830d840fc8bb395161e630cc1018178b",
      "src/libANGLE/validationGL13_autogen.h":
        "628d9bb0fbf10e1183858a85549d0a41",
      "src/libANGLE/validationGL14_autogen.h":
        "afdd1341b910e4b284e753133c1aaea0",
      "src/libANGLE/validationGL15_autogen.h":
        "8da60793706641f98b3226eb7a043f3b",
      "src/libANGLE/validationGL1_autogen.h":
        "2ae0a00f2a3322677fd942be597bb325",
      "src/libANGLE/validationGL21_autogen.h":
        "e8fbcf4149d939eac029eab87d78a6ea",
      "src/libANGLE/validationGL2_autogen.h":
        "bf5fcae82d37caf981ffda076bc65d22",
      "src/libANGLE/validationGL31_autogen.h":
        "bc6c38e78c7d6992a8faa6dde3c79b01",
      "src/libANGLE/validationGL32_autogen.h":
        "73b25ee47521e925bee4f09d1505e50a",
      "src/libANGLE/validationGL33_autogen.h":
        "c92b5328ede5bd50c7e740ff7c841c8e",
      "src/libANGLE/validationGL3_autogen.h":
        "938f0dd522dde29fee4f87dcffd2efa5",
      "src/libANGLE/validationGL41_autogen.h":
        "65395edc069ae31f394b4f758af2e75c",
      "src/libANGLE/validationGL42_autogen.h":
        "4e0d47ea23484b2e424c2a8ed8d350ae",
      "src/libANGLE/validationGL43_autogen.h":
        "0ddea54b245eef67e16e6e087a65c836",
      "src/libANGLE/validationGL44_autogen.h":
        "e0825785852ad660ff68c5bbf0df61f3",
      "src/libANGLE/validationGL45_autogen.h":
        "003b973f7c94082046fbf0fc086e56de",
      "src/libANGLE/validationGL46_autogen.h":
        "9f8b4e5fde25137640c5d6c450586f76",
      "src/libANGLE/validationGL4_autogen.h":
        "71b13ac14f7654a19f7606cb23309551",
      "src/libGL/entry_points_gl_1_0_autogen.cpp":
        "e984e675dab9624214609fc86f1330a8",
      "src/libGL/entry_points_gl_1_0_autogen.h":
        "4ff00afc21780bc6c138b5431a2d067c",
      "src/libGL/entry_points_gl_1_1_autogen.cpp":
        "253205804905c1e5bf6422c1df606079",
      "src/libGL/entry_points_gl_1_1_autogen.h":
        "570a839bb336d8f5f83d3b50fe49411a",
      "src/libGL/entry_points_gl_1_2_autogen.cpp":
        "0ca1ad8d1a3a48c8053b4081bdf5f5e4",
      "src/libGL/entry_points_gl_1_2_autogen.h":
        "3f52187f299fe96672384e1646f4a1cb",
      "src/libGL/entry_points_gl_1_3_autogen.cpp":
        "5bce9f7bb2639a7de57e925a028039ef",
      "src/libGL/entry_points_gl_1_3_autogen.h":
        "5ea36d869b82a824d5f290625c4ea052",
      "src/libGL/entry_points_gl_1_4_autogen.cpp":
        "e799387d084ae718fe0762d48c1a40b9",
      "src/libGL/entry_points_gl_1_4_autogen.h":
        "2c5d31ca248507a024e4724c74283ec4",
      "src/libGL/entry_points_gl_1_5_autogen.cpp":
        "aaddbde89c780194ac4754f7a1177c84",
      "src/libGL/entry_points_gl_1_5_autogen.h":
        "978457aa9a40e427846b6dea24608903",
      "src/libGL/entry_points_gl_2_0_autogen.cpp":
        "84159251135f9ff63ab46b0d44717e8c",
      "src/libGL/entry_points_gl_2_0_autogen.h":
        "41b0cd064167fac84bcdb1896a275b1b",
      "src/libGL/entry_points_gl_2_1_autogen.cpp":
        "fb873cf58c85b5f7bb3806723bb9cc7d",
      "src/libGL/entry_points_gl_2_1_autogen.h":
        "1da48dec560ea5ff8cadf4d0b6bfde1c",
      "src/libGL/entry_points_gl_3_0_autogen.cpp":
        "b0f24eb8d41ed4e74f344310ae5cae58",
      "src/libGL/entry_points_gl_3_0_autogen.h":
        "0fad8005f23815beb8ee9b3797c00b83",
      "src/libGL/entry_points_gl_3_1_autogen.cpp":
        "647252cbc585ec413121fe6cd16c8dbf",
      "src/libGL/entry_points_gl_3_1_autogen.h":
        "a68ff6c69f0ce95d9730e22bb4c63366",
      "src/libGL/entry_points_gl_3_2_autogen.cpp":
        "d7cddaca9a2c6e051a4dec76b03611f2",
      "src/libGL/entry_points_gl_3_2_autogen.h":
        "f162c4e93a64ab2e43048a0937f7c46f",
      "src/libGL/entry_points_gl_3_3_autogen.cpp":
        "30f8dfd5b902d203abab84c5795e4e4b",
      "src/libGL/entry_points_gl_3_3_autogen.h":
        "51c0e4f074c85447f5d910c63b9ea61c",
      "src/libGL/entry_points_gl_4_0_autogen.cpp":
        "bd045ed365a4221b687a5165ed19ebd1",
      "src/libGL/entry_points_gl_4_0_autogen.h":
        "35d611138951cebc29db99c9bf3a9e5f",
      "src/libGL/entry_points_gl_4_1_autogen.cpp":
        "3e222566ead25c7502759f9791e046a7",
      "src/libGL/entry_points_gl_4_1_autogen.h":
        "beec6659a3a77695dad66df90717c6ba",
      "src/libGL/entry_points_gl_4_2_autogen.cpp":
        "048be315948850676439b43fbc215d80",
      "src/libGL/entry_points_gl_4_2_autogen.h":
        "a2cb2a48cceaf6131f96bf8ec556aa55",
      "src/libGL/entry_points_gl_4_3_autogen.cpp":
        "7201a2e9773d607756ffcd1e3a0f14f5",
      "src/libGL/entry_points_gl_4_3_autogen.h":
        "abfa431742a2b643db21220944e10ab0",
      "src/libGL/entry_points_gl_4_4_autogen.cpp":
        "cb8e53abee5240a9b21261ece4245344",
      "src/libGL/entry_points_gl_4_4_autogen.h":
        "cdf1651f00d26db547b153afc09acc1c",
      "src/libGL/entry_points_gl_4_5_autogen.cpp":
        "edcdb0812eb93bb326206ed36e926fd2",
      "src/libGL/entry_points_gl_4_5_autogen.h":
        "9f5de9513c06b82aca60856860f7b716",
      "src/libGL/entry_points_gl_4_6_autogen.cpp":
        "a007b9c5e0b5c445adf64e9f00ab7092",
      "src/libGL/entry_points_gl_4_6_autogen.h":
        "ee3150d4a8d267271a02e38e8feb923a",
      "src/libGL/libGL_autogen.cpp":
        "846fe3b32c9b0931ca2d749216131b00",
      "src/libGL/libGL_autogen.def":
        "2789d87b05eea9f53d52e2aff499b785",
      "src/libGLESv2/entry_points_gles_1_0_autogen.cpp":
        "9047ef2452a45c86c4a92b568f6877c3",
      "src/libGLESv2/entry_points_gles_1_0_autogen.h":
        "899dcff9383465380f94fbdfe5bcf0a0",
      "src/libGLESv2/entry_points_gles_2_0_autogen.cpp":
        "6691602981aa499d9f161fad9e29dc97",
      "src/libGLESv2/entry_points_gles_2_0_autogen.h":
        "26387e27cbddf5e34d6cd9f850cb8b64",
      "src/libGLESv2/entry_points_gles_3_0_autogen.cpp":
        "ef0c7e4e95e4a24df1a5444e73bd9546",
      "src/libGLESv2/entry_points_gles_3_0_autogen.h":
        "0d246024379fbf55b87204db5d6a37e3",
      "src/libGLESv2/entry_points_gles_3_1_autogen.cpp":
        "25e9c5b7fe2ff636900b58bcc85d988e",
      "src/libGLESv2/entry_points_gles_3_1_autogen.h":
        "69bae5c94ed4665836a8464b6c353f9a",
      "src/libGLESv2/entry_points_gles_3_2_autogen.cpp":
        "af1667dfdb02f265ff1cee8d3631081c",
      "src/libGLESv2/entry_points_gles_3_2_autogen.h":
        "5798aa0a73af1d4ba5dfe99b6217a247",
      "src/libGLESv2/entry_points_gles_ext_autogen.cpp":
        "f53751a882a30cbf6d08156ba56dcd15",
      "src/libGLESv2/entry_points_gles_ext_autogen.h":
        "6cd7104749bf62e5dcab936c18c0b142",
      "src/libGLESv2/libGLESv2_autogen.cpp":
        "7212d09a6716a6673cac5a97ce3a3698",
      "src/libGLESv2/libGLESv2_autogen.def":
        "e72f37eaa0c7e2f6acaf6f1454eb094a",
      "src/libGLESv2/libGLESv2_no_capture_autogen.def":
        "0213e131141ab741d5fd530e623c34e3",
      "src/libGLESv2/libGLESv2_with_capture_autogen.def":
        "8a8639550b84ed42c1b4c79d15ac2553"
    }