summaryrefslogtreecommitdiffstats
path: root/opengl/system/gralloc/gralloc.cpp
diff options
context:
space:
mode:
authorJesse Hall <jessehall@google.com>2014-05-28 21:01:14 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-05-28 21:01:14 +0000
commitaec15d91ee48797f2b3c3fe61cca977900ebcd47 (patch)
tree8de7e3f63d31097b23f2a6f08b43419abedc2bb3 /opengl/system/gralloc/gralloc.cpp
parent6ccaeebd78dcb5e20e2c0e81cdc571fb74f9cfb7 (diff)
parent646f0b25e63164950d1d99b9b8021be74c2321c6 (diff)
downloadandroid_device_generic_goldfish-aec15d91ee48797f2b3c3fe61cca977900ebcd47.tar.gz
android_device_generic_goldfish-aec15d91ee48797f2b3c3fe61cca977900ebcd47.tar.bz2
android_device_generic_goldfish-aec15d91ee48797f2b3c3fe61cca977900ebcd47.zip
am 646f0b25: Merge "opengl: rcOpenColorBuffer must be synchronous"
* commit '646f0b25e63164950d1d99b9b8021be74c2321c6': opengl: rcOpenColorBuffer must be synchronous
Diffstat (limited to 'opengl/system/gralloc/gralloc.cpp')
-rw-r--r--opengl/system/gralloc/gralloc.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/opengl/system/gralloc/gralloc.cpp b/opengl/system/gralloc/gralloc.cpp
index 442bbcc..ac812c1 100644
--- a/opengl/system/gralloc/gralloc.cpp
+++ b/opengl/system/gralloc/gralloc.cpp
@@ -531,7 +531,7 @@ static int gralloc_register_buffer(gralloc_module_t const* module,
if (cb->hostHandle != 0) {
DEFINE_AND_VALIDATE_HOST_CONNECTION;
D("Opening host ColorBuffer 0x%x\n", cb->hostHandle);
- rcEnc->rcOpenColorBuffer(rcEnc, cb->hostHandle);
+ rcEnc->rcOpenColorBuffer2(rcEnc, cb->hostHandle);
}
//