summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndroid (Google) Code Review <android-gerrit@google.com>2009-05-20 18:00:01 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2009-05-20 18:00:01 -0700
commitbb7b7b316a6a15f4df6af3c62a293920c68c7b00 (patch)
tree652a56523b3e2413c672c88de9084fd91ee5321f
parentdb2b8015a9123574e58b32d221281c1b75c5d443 (diff)
parent16da7959a072da0d5fdc3a774fa01fb4d811d46f (diff)
downloadframeworks_base-bb7b7b316a6a15f4df6af3c62a293920c68c7b00.zip
frameworks_base-bb7b7b316a6a15f4df6af3c62a293920c68c7b00.tar.gz
frameworks_base-bb7b7b316a6a15f4df6af3c62a293920c68c7b00.tar.bz2
Merge change 2152 into donut
* changes: make sure to fail to software when the h/w renderer cannot be initialized
-rw-r--r--opengl/libs/EGL/gpu.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/opengl/libs/EGL/gpu.cpp b/opengl/libs/EGL/gpu.cpp
index f9dc5f1..4c902c8 100644
--- a/opengl/libs/EGL/gpu.cpp
+++ b/opengl/libs/EGL/gpu.cpp
@@ -118,6 +118,11 @@ request_gpu_t* gpu_acquire(void* user)
return 0;
}
+ if (info.regs == 0) {
+ LOGD("requestGPU() failed");
+ return 0;
+ }
+
bool failed = false;
request_gpu_t* gpu = &gRegions;
memset(gpu, 0, sizeof(*gpu));