diff options
| author | Stan Iliev <stani@google.com> | 2018-09-04 22:00:00 +0000 |
|---|---|---|
| committer | Stan Iliev <stani@google.com> | 2018-09-05 01:58:34 +0000 |
| commit | 564ca3e2c9ed752f2a9d549ebfb31a78942ecfec (patch) | |
| tree | f5a88d6ac251afadbbcc602047c2d901bf8cac55 /native/android/surface_texture.cpp | |
| parent | 73855d407137e670b1f836ec15b21bd7a4b1a187 (diff) | |
Reland "TextureView Vulkan support and optimized OpenGL draw"
Fix an issue with incorrect texture matrix, when there is 90/270 rotation.
This happened, because after refactoring SkImage has buffer width/height,
instead of layer width/height.
This reverts commit a683eb3945320f592f58705c3c31b3c044f4bd72.
Bug: 113673613
Test: Ran TextureView CTS and lensblur in camera app
Change-Id: If3bcf9cd5195de09fd67a753708568a8e3ca3a9a
Diffstat (limited to 'native/android/surface_texture.cpp')
| -rw-r--r-- | native/android/surface_texture.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/native/android/surface_texture.cpp b/native/android/surface_texture.cpp index b26688190ccd..ced2792775d4 100644 --- a/native/android/surface_texture.cpp +++ b/native/android/surface_texture.cpp @@ -21,15 +21,16 @@ #include <utils/Log.h> -#include <gui/GLConsumer.h> #include <gui/Surface.h> #include <android_runtime/android_graphics_SurfaceTexture.h> +#include "surfacetexture/SurfaceTexture.h" + using namespace android; struct ASurfaceTexture { - sp<GLConsumer> consumer; + sp<SurfaceTexture> consumer; sp<IGraphicBufferProducer> producer; }; |