diff options
author | Mathias Agopian <mathias@google.com> | 2013-08-02 01:40:18 -0700 |
---|---|---|
committer | Mathias Agopian <mathias@google.com> | 2013-08-06 20:05:36 +0000 |
commit | db89edc94bd2a78226b407f9f7261e202e7fa325 (patch) | |
tree | 007ffcc43a42459a5a089d3be8c51f81d40dd096 /opengl/tools | |
parent | 687821c05b5a85db1b172e7599861c803d268a8d (diff) | |
download | frameworks_native-db89edc94bd2a78226b407f9f7261e202e7fa325.zip frameworks_native-db89edc94bd2a78226b407f9f7261e202e7fa325.tar.gz frameworks_native-db89edc94bd2a78226b407f9f7261e202e7fa325.tar.bz2 |
All consumers now take an IGraphicBufferConsumer instead of a BufferQueue
this means they only have access to the consumer end of
the interface. we had a lot of code that assumed consumers
where holding a BufferQueue (i.e.: both ends), so most of
this change is untangling in fix that
Bug: 9265647
Change-Id: Ic2e2596ee14c7535f51bf26d9a897a0fc036d22c
Diffstat (limited to 'opengl/tools')
-rw-r--r-- | opengl/tools/glgen/stubs/egl/eglCreateWindowSurface.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/opengl/tools/glgen/stubs/egl/eglCreateWindowSurface.cpp b/opengl/tools/glgen/stubs/egl/eglCreateWindowSurface.cpp index 906cd80..0cfd886 100644 --- a/opengl/tools/glgen/stubs/egl/eglCreateWindowSurface.cpp +++ b/opengl/tools/glgen/stubs/egl/eglCreateWindowSurface.cpp @@ -90,7 +90,7 @@ android_eglCreateWindowSurfaceTexture jint _remaining; EGLint *attrib_list = (EGLint *) 0; android::sp<ANativeWindow> window; - android::sp<android::GLConsumer> glConsumer; + android::sp<android::IGraphicBufferProducer> producer; if (!attrib_list_ref) { _exception = 1; @@ -111,12 +111,12 @@ not_valid_surface: _exceptionMessage = "Make sure the SurfaceView or associated SurfaceHolder has a valid Surface"; goto exit; } - glConsumer = android::SurfaceTexture_getSurfaceTexture(_env, win); + producer = android::SurfaceTexture_getProducer(_env, win); - if (glConsumer == NULL) + if (producer == NULL) goto not_valid_surface; - window = new android::Surface(glConsumer->getBufferQueue()); + window = new android::Surface(producer); if (window == NULL) goto not_valid_surface; |