commit e77e61f28c8f4662f87c55a41d2b8f8154a94cc2
author Craig Donner <cdonner@google.com> Tue Apr 18 19:47:41 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Apr 18 19:47:41 2017 +0000
tree d9991d114b1589b86a73a91c170778a0a86cdce9
parent d2f03afc454b09962335c3c9a8315ba69b361f95
parent ef584235e30c5ee50bdec784ad8a0b2e85962cf3

Merge "Expose EGL_ANDROID_native_fence_sync." into oc-dev am: 44f7bbe6d3
am: ef584235e3

Change-Id: I7b631f0140c01cbfc6269c5fe5c6c100b309c599

opengl/libs/EGL/eglApi.cpp

diff --git a/opengl/libs/EGL/eglApi.cpp b/opengl/libs/EGL/eglApi.cpp
index 0807d1f..9de15d0 100644
--- a/opengl/libs/EGL/eglApi.cpp
+++ b/opengl/libs/EGL/eglApi.cpp
@@ -223,6 +223,10 @@
             (__eglMustCastToProperFunctionPointerType)&eglGetFrameTimestampsANDROID },
     { "eglGetFrameTimestampSupportedANDROID",
             (__eglMustCastToProperFunctionPointerType)&eglGetFrameTimestampSupportedANDROID },
+
+    // EGL_ANDROID_native_fence_sync
+    { "eglDupNativeFenceFDANDROID",
+            (__eglMustCastToProperFunctionPointerType)&eglDupNativeFenceFDANDROID },
 };
 
 /*
@@ -232,8 +236,7 @@
 #define FILTER_EXTENSIONS(procname) \
         (!strcmp((procname), "eglSetBlobCacheFuncsANDROID") ||    \
          !strcmp((procname), "eglHibernateProcessIMG")      ||    \
-         !strcmp((procname), "eglAwakenProcessIMG")         ||    \
-         !strcmp((procname), "eglDupNativeFenceFDANDROID"))
+         !strcmp((procname), "eglAwakenProcessIMG"))