aboutsummaryrefslogtreecommitdiffstats
path: root/android/help.c
diff options
context:
space:
mode:
authorJesse Hall <jessehall@google.com>2012-04-19 11:46:09 -0700
committerandroid code review <noreply-gerritcodereview@google.com>2012-04-19 11:46:09 -0700
commitc135d75d5ae774d7349f1cf346eee03072047179 (patch)
treec49d8db83b0018b66bbd0651ce17f0c155dba625 /android/help.c
parentbdd020b108b63fcfccefb2905b9d0401f739981a (diff)
parent7e959f0ba6515b7998d00eb1b79d613b2550eb3c (diff)
downloadexternal_qemu-c135d75d5ae774d7349f1cf346eee03072047179.zip
external_qemu-c135d75d5ae774d7349f1cf346eee03072047179.tar.gz
external_qemu-c135d75d5ae774d7349f1cf346eee03072047179.tar.bz2
Merge "Reword -help-gpu text for clarity and accuracy"
Diffstat (limited to 'android/help.c')
-rw-r--r--android/help.c18
1 files changed, 10 insertions, 8 deletions
diff --git a/android/help.c b/android/help.c
index 20758c0..c6ffb87 100644
--- a/android/help.c
+++ b/android/help.c
@@ -1432,12 +1432,12 @@ static void
help_gpu(stralloc_t* out)
{
PRINTF(
- " Use -gpu <mode> to force the mode of hardware OpenGLES emulation.\n"
- " Valid values for <mode> are:\n\n"
+ " Use -gpu <mode> to override the mode of hardware OpenGL ES emulation\n"
+ " indicated by the AVD. Valid values for <mode> are:\n\n"
" on -> enable GPU emulation\n"
" off -> disable GPU emulation\n"
- " auto -> automatic detection\n"
+ " auto -> use the setting from the AVD\n"
" enabled -> same as 'on'\n"
" disabled -> same as 'off'\n\n"
@@ -1448,11 +1448,13 @@ help_gpu(stralloc_t* out)
" force the virtual device to use the slow software renderer instead.\n"
" Note that OpenGLES 2.0 is _not_ supported by it.\n\n"
- " The 'auto' mode is the default. It will only enable GPU emulation if the\n"
- " virtual device supports it, and the host-side OpenGLES emulation library\n"
- " could be properly initialized (this can fail when you run the emulator\n"
- " under certain restricted environments where the program can't access the\n"
- " graphics sub-system (e.g. head-less servers).\n"
+ " The 'auto' mode is the default. In this mode, the hw.gpu.enabled setting\n"
+ " in the AVD's hardware-qemu.ini file will determine whether GPU emulation\n"
+ " is enabled.\n\n"
+
+ " Even if hardware GPU emulation is enabled, if the host-side OpenGL ES\n"
+ " emulation library cannot be initialized, the emulator will run with GPU\n"
+ " emulation disabled rather than failing to start.\n"
);
}