aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid 'Digit' Turner <digit@android.com>2011-04-11 09:23:40 -0700
committerAndroid Code Review <code-review@android.com>2011-04-11 09:23:40 -0700
commit878c37d6428ff0ea6141dfddc22d549b07b5dde3 (patch)
treece959cd77cef03af5763ce38ac8a4d9cabd5ba62
parentc8feef0f01aac2c92191bd00980b3adb2a2069a8 (diff)
parent5b48149747c214e9951fd8ce0926c45d6926fc3d (diff)
downloadexternal_qemu-878c37d6428ff0ea6141dfddc22d549b07b5dde3.zip
external_qemu-878c37d6428ff0ea6141dfddc22d549b07b5dde3.tar.gz
external_qemu-878c37d6428ff0ea6141dfddc22d549b07b5dde3.tar.bz2
Merge "vl-android.c: Init opengles pipe on startup"
-rw-r--r--vl-android.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/vl-android.c b/vl-android.c
index 59b7c72..89b0e3f 100644
--- a/vl-android.c
+++ b/vl-android.c
@@ -52,6 +52,7 @@
#include "modem_driver.h"
#include "android/gps.h"
#include "android/hw-qemud.h"
+#include "android/hw-qemud-pipe.h"
#include "android/hw-kmsg.h"
#include "android/charmap.h"
#include "android/globals.h"
@@ -5171,6 +5172,9 @@ int main(int argc, char **argv, char **envp)
}
}
+ /* Initialize OpenGLES emulation */
+ android_hw_opengles_init();
+
if (android_op_cpu_delay) {
char* end;
long delay = strtol(android_op_cpu_delay, &end, 0);