aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVladimir Chtchetkine <vchtchetkine@google.com>2012-05-11 15:32:52 -0700
committerandroid code review <noreply-gerritcodereview@google.com>2012-05-11 15:32:53 -0700
commit10a4d62985dbafe9d40cae9b6fbcb9605b4c3af5 (patch)
treeb0c0113929e31546f01857cd023d9d4da037e60d
parentad82bb114ade2362be7d740835463b092d167741 (diff)
parent8de6a30e3b2035b39f308febe2f9536671547096 (diff)
downloadexternal_qemu-10a4d62985dbafe9d40cae9b6fbcb9605b4c3af5.zip
external_qemu-10a4d62985dbafe9d40cae9b6fbcb9605b4c3af5.tar.gz
external_qemu-10a4d62985dbafe9d40cae9b6fbcb9605b4c3af5.tar.bz2
Merge "Catch up with OpenGLES API changes."
-rw-r--r--android/multitouch-port.c13
1 files changed, 13 insertions, 0 deletions
diff --git a/android/multitouch-port.c b/android/multitouch-port.c
index 7cb9656..d872b30 100644
--- a/android/multitouch-port.c
+++ b/android/multitouch-port.c
@@ -22,6 +22,7 @@
#include "android/sdk-controller-socket.h"
#include "android/multitouch-port.h"
#include "android/globals.h" /* for android_hw */
+#include "android/opengles.h"
#include "android/utils/misc.h"
#include "android/utils/jpeg-compress.h"
#include "android/utils/debug.h"
@@ -247,14 +248,26 @@ _on_multitouch_port_connection(void* opaque,
case SDKCTL_PORT_DISCONNECTED:
D("Multi-touch: SDK Controller is disconnected");
+ // Disable OpenGLES framebuffer updates.
+ if (android_hw->hw_gpu_enabled) {
+ android_setPostCallback(NULL, NULL);
+ }
break;
case SDKCTL_PORT_ENABLED:
D("Multi-touch: SDK Controller port is enabled.");
+ // Enable OpenGLES framebuffer updates.
+ if (android_hw->hw_gpu_enabled) {
+ android_setPostCallback(multitouch_opengles_fb_update, NULL);
+ }
break;
case SDKCTL_PORT_DISABLED:
D("Multi-touch: SDK Controller port is disabled.");
+ // Disable OpenGLES framebuffer updates.
+ if (android_hw->hw_gpu_enabled) {
+ android_setPostCallback(NULL, NULL);
+ }
break;
case SDKCTL_HANDSHAKE_CONNECTED: