diff options
| author | Andy McFadden <fadden@android.com> | 2012-12-18 09:49:45 -0800 |
|---|---|---|
| committer | Andy McFadden <fadden@android.com> | 2012-12-18 13:10:48 -0800 |
| commit | 2adaf04fab35cf47c824d74d901b54094e01ccd3 (patch) | |
| tree | 1201bd220bfea6d308a119e6a986d783e548a10a /opengl | |
| parent | f7baee731e81bfa7f7ccf2e0e03560f5073bc431 (diff) | |
| download | frameworks_native-2adaf04fab35cf47c824d74d901b54094e01ccd3.zip frameworks_native-2adaf04fab35cf47c824d74d901b54094e01ccd3.tar.gz frameworks_native-2adaf04fab35cf47c824d74d901b54094e01ccd3.tar.bz2 | |
Rename ISurfaceTexture and SurfaceTexture
The C++ class names don't match what the classes do, so rename
ISurfaceTexture to IGraphicBufferProducer, and SurfaceTexture to
GLConsumer.
Bug 7736700
Change-Id: Ia03e468888025b5cae3c0ee1995434515dbea387
Diffstat (limited to 'opengl')
| -rw-r--r-- | opengl/tests/EGLTest/EGL_test.cpp | 2 | ||||
| -rw-r--r-- | opengl/tools/glgen/stubs/egl/EGL14cHeader.cpp | 4 | ||||
| -rw-r--r-- | opengl/tools/glgen/stubs/egl/eglCreateWindowSurface.cpp | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/opengl/tests/EGLTest/EGL_test.cpp b/opengl/tests/EGLTest/EGL_test.cpp index d511cae..ec433fb 100644 --- a/opengl/tests/EGLTest/EGL_test.cpp +++ b/opengl/tests/EGLTest/EGL_test.cpp @@ -104,7 +104,7 @@ TEST_F(EGLTest, EGLTerminateSucceedsWithRemainingObjects) { // Create a EGLSurface sp<BufferQueue> bq = new BufferQueue(); bq->consumerConnect(new DummyConsumer()); - sp<SurfaceTextureClient> mSTC = new SurfaceTextureClient(static_cast<sp<ISurfaceTexture> >( bq)); + sp<SurfaceTextureClient> mSTC = new SurfaceTextureClient(static_cast<sp<IGraphicBufferProducer> >( bq)); sp<ANativeWindow> mANW = mSTC; EGLSurface eglSurface = eglCreateWindowSurface(mEglDisplay, config, diff --git a/opengl/tools/glgen/stubs/egl/EGL14cHeader.cpp b/opengl/tools/glgen/stubs/egl/EGL14cHeader.cpp index 7904ac7..290d102 100644 --- a/opengl/tools/glgen/stubs/egl/EGL14cHeader.cpp +++ b/opengl/tools/glgen/stubs/egl/EGL14cHeader.cpp @@ -1,4 +1,4 @@ -** +/* ** Copyright 2012, The Android Open Source Project ** ** Licensed under the Apache License, Version 2.0 (the "License"); @@ -27,7 +27,7 @@ #include <EGL/egl.h> #include <gui/Surface.h> -#include <gui/SurfaceTexture.h> +#include <gui/GLConsumer.h> #include <gui/SurfaceTextureClient.h> #include <ui/ANativeObjectBase.h> diff --git a/opengl/tools/glgen/stubs/egl/eglCreateWindowSurface.cpp b/opengl/tools/glgen/stubs/egl/eglCreateWindowSurface.cpp index 610cde5..a3d000a 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::SurfaceTexture> surfaceTexture; + android::sp<android::GLConsumer> glConsumer; if (!attrib_list_ref) { _exception = 1; @@ -111,8 +111,8 @@ not_valid_surface: _exceptionMessage = "Make sure the SurfaceView or associated SurfaceHolder has a valid Surface"; goto exit; } - surfaceTexture = android::SurfaceTexture_getSurfaceTexture(_env, win); - window = new android::SurfaceTextureClient(surfaceTexture); + glConsumer = android::SurfaceTexture_getSurfaceTexture(_env, win); + window = new android::SurfaceTextureClient(glConsumer); if (window == NULL) goto not_valid_surface; |