diff options
| author | Jesse Hall <jessehall@google.com> | 2014-05-28 21:01:14 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-28 21:01:14 +0000 |
| commit | aec15d91ee48797f2b3c3fe61cca977900ebcd47 (patch) | |
| tree | 8de7e3f63d31097b23f2a6f08b43419abedc2bb3 /opengl/system/renderControl_enc/renderControl_entry.cpp | |
| parent | 6ccaeebd78dcb5e20e2c0e81cdc571fb74f9cfb7 (diff) | |
| parent | 646f0b25e63164950d1d99b9b8021be74c2321c6 (diff) | |
| download | android_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/renderControl_enc/renderControl_entry.cpp')
| -rw-r--r-- | opengl/system/renderControl_enc/renderControl_entry.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/opengl/system/renderControl_enc/renderControl_entry.cpp b/opengl/system/renderControl_enc/renderControl_entry.cpp index 9a0bba9..a15fd14 100644 --- a/opengl/system/renderControl_enc/renderControl_entry.cpp +++ b/opengl/system/renderControl_enc/renderControl_entry.cpp @@ -31,6 +31,7 @@ extern "C" { EGLint rcColorBufferCacheFlush(uint32_t colorbuffer, EGLint postCount, int forRead); void rcReadColorBuffer(uint32_t colorbuffer, GLint x, GLint y, GLint width, GLint height, GLenum format, GLenum type, void* pixels); int rcUpdateColorBuffer(uint32_t colorbuffer, GLint x, GLint y, GLint width, GLint height, GLenum format, GLenum type, void* pixels); + int rcOpenColorBuffer2(uint32_t colorbuffer); }; #endif @@ -190,3 +191,9 @@ int rcUpdateColorBuffer(uint32_t colorbuffer, GLint x, GLint y, GLint width, GLi return ctx->rcUpdateColorBuffer(ctx, colorbuffer, x, y, width, height, format, type, pixels); } +int rcOpenColorBuffer2(uint32_t colorbuffer) +{ + GET_CONTEXT; + return ctx->rcOpenColorBuffer2(ctx, colorbuffer); +} + |