summaryrefslogtreecommitdiffstats
path: root/jni
diff options
context:
space:
mode:
authorRuei-sung Lin <rslin@google.com>2012-05-31 11:59:31 -0700
committerRuei-sung Lin <rslin@google.com>2012-06-01 20:14:58 -0700
commit0bd89c21b27aaacdb93a46fa67856344034feec2 (patch)
treee4b0c03745d096de2eb7f530306d04a3eefd6b66 /jni
parenta053a3179cfee3d2bb666eff5f4f03a96b092e04 (diff)
downloadandroid_packages_apps_Snap-0bd89c21b27aaacdb93a46fa67856344034feec2.tar.gz
android_packages_apps_Snap-0bd89c21b27aaacdb93a46fa67856344034feec2.tar.bz2
android_packages_apps_Snap-0bd89c21b27aaacdb93a46fa67856344034feec2.zip
Fix b/6590795 dejank photo effect slider
Change-Id: I14737bd01361b58c6bd4af19957d514368cc19ea
Diffstat (limited to 'jni')
-rw-r--r--jni/Android.mk16
-rw-r--r--jni/jni_egl_fence.cpp44
-rw-r--r--jni/jni_egl_fence.h33
3 files changed, 93 insertions, 0 deletions
diff --git a/jni/Android.mk b/jni/Android.mk
new file mode 100644
index 000000000..eedfa0bff
--- /dev/null
+++ b/jni/Android.mk
@@ -0,0 +1,16 @@
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_CFLAGS += -DEGL_EGLEXT_PROTOTYPES
+
+LOCAL_SRC_FILES := jni_egl_fence.cpp
+
+LOCAL_SHARED_LIBRARIES := libcutils libEGL
+
+LOCAL_MODULE_TAGS := optional
+
+LOCAL_MODULE := libjni_eglfence
+
+include $(BUILD_SHARED_LIBRARY)
+
diff --git a/jni/jni_egl_fence.cpp b/jni/jni_egl_fence.cpp
new file mode 100644
index 000000000..8d557df31
--- /dev/null
+++ b/jni/jni_egl_fence.cpp
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "jni_egl_fence.h"
+
+#include <cutils/log.h>
+#include <EGL/egl.h>
+#include <EGL/eglext.h>
+
+void
+Java_com_android_gallery3d_photoeditor_FilterStack_nativeEglSetFenceAndWait(JNIEnv* env,
+ jobject thiz) {
+ EGLDisplay display = eglGetCurrentDisplay();
+
+ // Create a egl fence and wait for egl to return it.
+ // Additional reference on egl fence sync can be found in:
+ // http://www.khronos.org/registry/vg/extensions/KHR/EGL_KHR_fence_sync.txt
+ EGLSyncKHR fence = eglCreateSyncKHR(display, EGL_SYNC_FENCE_KHR, NULL);
+ if (fence == EGL_NO_SYNC_KHR) {
+ return;
+ }
+
+ EGLint result = eglClientWaitSyncKHR(display,
+ fence,
+ EGL_SYNC_FLUSH_COMMANDS_BIT_KHR,
+ EGL_FOREVER_KHR);
+ if (result == EGL_FALSE) {
+ ALOGE("EGL FENCE: error waiting for fence: %#x", eglGetError());
+ }
+ eglDestroySyncKHR(display, fence);
+}
diff --git a/jni/jni_egl_fence.h b/jni/jni_egl_fence.h
new file mode 100644
index 000000000..6b2c20ab8
--- /dev/null
+++ b/jni/jni_egl_fence.h
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef COM_ANDROID_GALLERY3D_PHOTOEDITOR_JNI_EGL_FENSE_H
+#define COM_ANDROID_GALLERY3D_PHOTOEDITOR_JNI_EGL_FENSE_H
+
+#include <jni.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+JNIEXPORT void JNICALL
+Java_com_android_gallery3d_photoeditor_FilterStack_nativeEglSetFenceAndWait(JNIEnv* env,
+ jobject thiz);
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* COM_ANDROID_GALLERY3D_PHOTOEDITOR_JNI_EGL_FENSE_H */