aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Hsieh <andrewhsieh@google.com>2012-05-06 20:17:26 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-05-06 20:17:26 -0700
commiteeed89db2546625b11bad0e8f812792c02f3cb65 (patch)
treec091b7d74009ace7cf0418c9c7ce89c88802ec76
parent401b9424929f17eb7441a54900f7eb848f07b85f (diff)
parentafb0118a8be2a3fd271b2af51ccc13a2429a5078 (diff)
downloadexternal_qemu-eeed89db2546625b11bad0e8f812792c02f3cb65.zip
external_qemu-eeed89db2546625b11bad0e8f812792c02f3cb65.tar.gz
external_qemu-eeed89db2546625b11bad0e8f812792c02f3cb65.tar.bz2
Merge "Fixed link-error for standalone emulator when CONFIG_ANDROID_OPENGLES == 0"
-rw-r--r--android/opengles.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/android/opengles.c b/android/opengles.c
index 521dc03..70e3f8c 100644
--- a/android/opengles.c
+++ b/android/opengles.c
@@ -12,6 +12,7 @@
#include "config-host.h"
#include "android/opengles.h"
+#include <assert.h>
/* Declared in "android/globals.h" */
int android_gles_fast_pipes = 1;
@@ -273,6 +274,15 @@ int android_startOpenglesRenderer(int width, int height, OnPostFunc onPost, void
return -1;
}
+void android_getOpenglesHardwareStrings(char* vendor, size_t vendorBufSize,
+ char* renderer, size_t rendererBufSize,
+ char* version, size_t versionBufSize)
+{
+ assert(vendorBufSize > 0 && rendererBufSize > 0 && versionBufSize > 0);
+ assert(vendor != NULL && renderer != NULL && version != NULL);
+ vendor[0] = renderer[0] = version[0] = 0;
+}
+
void android_stopOpenglesRenderer(void)
{}