diff options
34 files changed, 283 insertions, 34 deletions
diff --git a/cmds/surfacereplayer/replayer/Android.mk b/cmds/surfacereplayer/replayer/Android.mk index 3ec3178681..9f06033446 100644 --- a/cmds/surfacereplayer/replayer/Android.mk +++ b/cmds/surfacereplayer/replayer/Android.mk @@ -61,6 +61,7 @@ LOCAL_SHARED_LIBRARIES := \ libprotobuf-cpp-lite \ libsurfacereplayer \ libutils \ + libgui \ LOCAL_STATIC_LIBRARIES := \ libtrace_proto \ diff --git a/include/gui/BufferItemConsumer.h b/include/gui/BufferItemConsumer.h index 56c7a3f463..ec77ec7d95 100644 --- a/include/gui/BufferItemConsumer.h +++ b/include/gui/BufferItemConsumer.h @@ -18,18 +18,13 @@ #define ANDROID_GUI_BUFFERITEMCONSUMER_H #include <gui/ConsumerBase.h> - -#include <ui/GraphicBuffer.h> - -#include <utils/String8.h> -#include <utils/Vector.h> -#include <utils/threads.h> +#include <gui/BufferQueue.h> #define ANDROID_GRAPHICS_BUFFERITEMCONSUMER_JNI_ID "mBufferItemConsumer" namespace android { -class BufferQueue; +class String8; /** * BufferItemConsumer is a BufferQueue consumer endpoint that allows clients diff --git a/include/gui/ConsumerBase.h b/include/gui/ConsumerBase.h index ce85fc3e8d..7912528ba7 100644 --- a/include/gui/ConsumerBase.h +++ b/include/gui/ConsumerBase.h @@ -17,19 +17,23 @@ #ifndef ANDROID_GUI_CONSUMERBASE_H #define ANDROID_GUI_CONSUMERBASE_H -#include <gui/BufferQueue.h> +#include <gui/BufferQueueDefs.h> +#include <gui/IConsumerListener.h> +#include <gui/IGraphicBufferConsumer.h> +#include <gui/OccupancyTracker.h> -#include <ui/GraphicBuffer.h> +#include <ui/PixelFormat.h> #include <utils/String8.h> #include <utils/Vector.h> #include <utils/threads.h> -#include <gui/IConsumerListener.h> + namespace android { // ---------------------------------------------------------------------------- class String8; +class GraphicBuffer; // ConsumerBase is a base class for BufferQueue consumer end-points. It // handles common tasks like management of the connection to the BufferQueue @@ -222,7 +226,7 @@ protected: // slot that has not yet been used. The buffer allocated to a slot will also // be replaced if the requested buffer usage or geometry differs from that // of the buffer allocated to a slot. - Slot mSlots[BufferQueue::NUM_BUFFER_SLOTS]; + Slot mSlots[BufferQueueDefs::NUM_BUFFER_SLOTS]; // mAbandoned indicates that the BufferQueue will no longer be used to // consume images buffers pushed to it using the IGraphicBufferProducer diff --git a/include/gui/CpuConsumer.h b/include/gui/CpuConsumer.h index b7aa463970..58602bf321 100644 --- a/include/gui/CpuConsumer.h +++ b/include/gui/CpuConsumer.h @@ -17,18 +17,19 @@ #ifndef ANDROID_GUI_CPUCONSUMER_H #define ANDROID_GUI_CPUCONSUMER_H -#include <gui/ConsumerBase.h> +#include <system/window.h> -#include <ui/GraphicBuffer.h> +#include <gui/ConsumerBase.h> +#include <gui/BufferQueue.h> -#include <utils/String8.h> #include <utils/Vector.h> -#include <utils/threads.h> namespace android { class BufferQueue; +class GraphicBuffer; +class String8; /** * CpuConsumer is a BufferQueue consumer endpoint that allows direct CPU diff --git a/include/gui/GLConsumer.h b/include/gui/GLConsumer.h index 4a49f53470..51d76665eb 100644 --- a/include/gui/GLConsumer.h +++ b/include/gui/GLConsumer.h @@ -20,8 +20,7 @@ #include <EGL/egl.h> #include <EGL/eglext.h> -#include <gui/IGraphicBufferProducer.h> -#include <gui/BufferQueue.h> +#include <gui/BufferQueueDefs.h> #include <gui/ConsumerBase.h> #include <ui/GraphicBuffer.h> @@ -489,7 +488,7 @@ private: // slot that has not yet been used. The buffer allocated to a slot will also // be replaced if the requested buffer usage or geometry differs from that // of the buffer allocated to a slot. - EglSlot mEglSlots[BufferQueue::NUM_BUFFER_SLOTS]; + EglSlot mEglSlots[BufferQueueDefs::NUM_BUFFER_SLOTS]; // mCurrentTexture is the buffer slot index of the buffer that is currently // bound to the OpenGL texture. It is initialized to INVALID_BUFFER_SLOT, diff --git a/include/gui/IGraphicBufferConsumer.h b/include/gui/IGraphicBufferConsumer.h index dcddca46e8..60b7d24b59 100644 --- a/include/gui/IGraphicBufferConsumer.h +++ b/include/gui/IGraphicBufferConsumer.h @@ -25,8 +25,9 @@ #include <utils/Timers.h> #include <binder/IInterface.h> + #include <ui/PixelFormat.h> -#include <ui/Rect.h> + #include <gui/OccupancyTracker.h> #include <EGL/egl.h> diff --git a/include/ui/Gralloc1On0Adapter.h b/include/ui/Gralloc1On0Adapter.h index fcd2245d97..b09fdc61a6 100644 --- a/include/ui/Gralloc1On0Adapter.h +++ b/include/ui/Gralloc1On0Adapter.h @@ -17,9 +17,11 @@ #ifndef ANDROID_UI_GRALLOC_1_ON_0_ADAPTER_H #define ANDROID_UI_GRALLOC_1_ON_0_ADAPTER_H +#include <log/log.h> + #include <ui/Fence.h> -#include <ui/GraphicBuffer.h> +#include <hardware/gralloc.h> #include <hardware/gralloc1.h> #include <mutex> @@ -27,6 +29,10 @@ #include <unordered_map> #include <vector> +namespace android { +class GraphicBuffer; +} // namespace android + struct gralloc_module_t; // This is not an "official" capability (i.e., it is not found in gralloc1.h), diff --git a/include/ui/Rect.h b/include/ui/Rect.h index ce33d4e031..02c926e428 100644 --- a/include/ui/Rect.h +++ b/include/ui/Rect.h @@ -45,13 +45,9 @@ public: template <typename T> inline Rect(T w, T h) { if (w > INT32_MAX) { - ALOG(LOG_WARN, "Rect", - "Width %u too large for Rect class, clamping", w); w = INT32_MAX; } if (h > INT32_MAX) { - ALOG(LOG_WARN, "Rect", - "Height %u too large for Rect class, clamping", h); h = INT32_MAX; } left = top = 0; diff --git a/libs/arect/Android.bp b/libs/arect/Android.bp new file mode 100644 index 0000000000..0d25176f98 --- /dev/null +++ b/libs/arect/Android.bp @@ -0,0 +1,27 @@ +// Copyright (C) 2017 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +ndk_headers { + name: "libarect_headers", + from: "include/android", + to: "android", + srcs: ["include/android/*.h"], + license: "NOTICE", +} + +cc_library_static { + name: "libarect", + host_supported: true, + export_include_dirs: ["include"], +} diff --git a/libs/arect/MODULE_LICENSE_APACHE2 b/libs/arect/MODULE_LICENSE_APACHE2 new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/libs/arect/MODULE_LICENSE_APACHE2 diff --git a/libs/arect/NOTICE b/libs/arect/NOTICE new file mode 100644 index 0000000000..c5b1efa7aa --- /dev/null +++ b/libs/arect/NOTICE @@ -0,0 +1,190 @@ + + Copyright (c) 2005-2008, The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + diff --git a/include/android/rect.h b/libs/arect/include/android/rect.h index 80741c0442..80741c0442 100644 --- a/include/android/rect.h +++ b/libs/arect/include/android/rect.h diff --git a/libs/gui/tests/SurfaceTextureClient_test.cpp b/libs/gui/tests/SurfaceTextureClient_test.cpp index b10d4ebde7..bd598e419e 100644 --- a/libs/gui/tests/SurfaceTextureClient_test.cpp +++ b/libs/gui/tests/SurfaceTextureClient_test.cpp @@ -23,6 +23,7 @@ #include <gtest/gtest.h> #include <gui/GLConsumer.h> #include <gui/Surface.h> +#include <gui/BufferQueue.h> #include <system/graphics.h> #include <utils/Log.h> #include <utils/Thread.h> diff --git a/libs/ui/Android.bp b/libs/ui/Android.bp index cfe170d47a..ea18644940 100644 --- a/libs/ui/Android.bp +++ b/libs/ui/Android.bp @@ -75,6 +75,12 @@ cc_library_shared { "libutils", "liblog", ], + + static_libs: [ + "libarect", + ], + + export_static_lib_headers: ["libarect"], } subdirs = ["tests"] diff --git a/libs/ui/Gralloc1.cpp b/libs/ui/Gralloc1.cpp index 0083f58aca..7952ed6aa8 100644 --- a/libs/ui/Gralloc1.cpp +++ b/libs/ui/Gralloc1.cpp @@ -17,6 +17,7 @@ //#define LOG_NDEBUG 0 #include <ui/Gralloc1.h> +#include <ui/GraphicBuffer.h> #include <vector> diff --git a/libs/ui/Gralloc1On0Adapter.cpp b/libs/ui/Gralloc1On0Adapter.cpp index a0bbe63cbd..4cc0e4b4d8 100644 --- a/libs/ui/Gralloc1On0Adapter.cpp +++ b/libs/ui/Gralloc1On0Adapter.cpp @@ -21,6 +21,7 @@ #include <hardware/gralloc.h> #include <ui/Gralloc1On0Adapter.h> +#include <ui/GraphicBuffer.h> #include <utils/Log.h> diff --git a/libs/ui/GraphicBufferMapper.cpp b/libs/ui/GraphicBufferMapper.cpp index a3b6e18cdd..f418f7f015 100644 --- a/libs/ui/GraphicBufferMapper.cpp +++ b/libs/ui/GraphicBufferMapper.cpp @@ -35,7 +35,7 @@ #include <ui/Gralloc1On0Adapter.h> #include <ui/GrallocMapper.h> #include <ui/GraphicBufferMapper.h> -#include <ui/Rect.h> +#include <ui/GraphicBuffer.h> #include <system/graphics.h> diff --git a/libs/vr/libbufferhub/include/private/dvr/native_buffer.h b/libs/vr/libbufferhub/include/private/dvr/native_buffer.h index afed052a71..f9b69750ac 100644 --- a/libs/vr/libbufferhub/include/private/dvr/native_buffer.h +++ b/libs/vr/libbufferhub/include/private/dvr/native_buffer.h @@ -3,7 +3,6 @@ #include <EGL/egl.h> #include <EGL/eglext.h> -#include <android/native_window.h> #include <log/log.h> #include <system/window.h> #include <ui/ANativeObjectBase.h> diff --git a/libs/vr/libeds/Android.mk b/libs/vr/libeds/Android.mk index 373e68ee88..fd2c56e4ad 100644 --- a/libs/vr/libeds/Android.mk +++ b/libs/vr/libeds/Android.mk @@ -36,7 +36,8 @@ sharedLibraries := \ libEGL \ libGLESv1_CM \ libGLESv2 \ - libvulkan + libvulkan \ + libandroid staticLibraries := \ libdisplay \ diff --git a/libs/vr/libsensor/Android.mk b/libs/vr/libsensor/Android.mk index 8c7ad43bd1..89abcb0c9f 100644 --- a/libs/vr/libsensor/Android.mk +++ b/libs/vr/libsensor/Android.mk @@ -32,6 +32,7 @@ sharedLibraries := \ libhardware \ liblog \ libutils \ + libandroid \ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(sourceFiles) diff --git a/opengl/libagl/egl.cpp b/opengl/libagl/egl.cpp index 48bf676327..04f6d6d1a3 100644 --- a/opengl/libagl/egl.cpp +++ b/opengl/libagl/egl.cpp @@ -33,6 +33,7 @@ #include <ui/ANativeObjectBase.h> #include <ui/Fence.h> #include <ui/GraphicBufferMapper.h> +#include <ui/Rect.h> #include <EGL/egl.h> #include <EGL/eglext.h> diff --git a/opengl/tests/hwc/Android.mk b/opengl/tests/hwc/Android.mk index 693fba416e..13337c2753 100644 --- a/opengl/tests/hwc/Android.mk +++ b/opengl/tests/hwc/Android.mk @@ -25,6 +25,8 @@ LOCAL_SRC_FILES:= hwcTestLib.cpp LOCAL_C_INCLUDES += system/extras/tests/include \ $(call include-path-for, opengl-tests-includes) \ +LOCAL_STATIC_LIBRARIES := libarect + include $(BUILD_STATIC_LIBRARY) include $(CLEAR_VARS) diff --git a/opengl/tests/lib/Android.mk b/opengl/tests/lib/Android.mk index 4407e7b5c5..0f1c925969 100644 --- a/opengl/tests/lib/Android.mk +++ b/opengl/tests/lib/Android.mk @@ -24,4 +24,6 @@ LOCAL_C_INCLUDES += system/extras/tests/include \ LOCAL_CFLAGS := -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES -Wall -Wextra -Werror +LOCAL_STATIC_LIBRARIES := libarect + include $(BUILD_STATIC_LIBRARY) diff --git a/services/surfaceflinger/Android.mk b/services/surfaceflinger/Android.mk index 9e81a8c95e..ec47c8a350 100644 --- a/services/surfaceflinger/Android.mk +++ b/services/surfaceflinger/Android.mk @@ -206,6 +206,7 @@ LOCAL_SHARED_LIBRARIES := \ liblog \ libbinder \ libutils \ + libui \ libdl LOCAL_WHOLE_STATIC_LIBRARIES := libsigchain diff --git a/services/surfaceflinger/DisplayHardware/FramebufferSurface.cpp b/services/surfaceflinger/DisplayHardware/FramebufferSurface.cpp index d3d0d51ca9..ae6e0cca83 100644 --- a/services/surfaceflinger/DisplayHardware/FramebufferSurface.cpp +++ b/services/surfaceflinger/DisplayHardware/FramebufferSurface.cpp @@ -27,15 +27,16 @@ #include <utils/String8.h> #include <log/log.h> -#include <ui/Rect.h> - #include <EGL/egl.h> #include <hardware/hardware.h> #include <gui/BufferItem.h> +#include <gui/BufferQueue.h> #include <gui/GraphicBufferAlloc.h> #include <gui/Surface.h> + #include <ui/GraphicBuffer.h> +#include <ui/Rect.h> #include "FramebufferSurface.h" #include "HWComposer.h" diff --git a/services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.cpp b/services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.cpp index 5f3c388819..c5a4f99a4b 100644 --- a/services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.cpp +++ b/services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.cpp @@ -19,6 +19,7 @@ #include "HWComposer.h" #include <gui/BufferItem.h> +#include <gui/BufferQueue.h> #include <gui/IProducerListener.h> // --------------------------------------------------------------------------- diff --git a/services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.h b/services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.h index 26366670a7..fb5fcc885c 100644 --- a/services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.h +++ b/services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.h @@ -179,7 +179,7 @@ private: // slot. Both mProducerSlotSource and mProducerBuffers are indexed by a // "producer slot"; see the mapSlot*() functions. uint64_t mProducerSlotSource; - sp<GraphicBuffer> mProducerBuffers[BufferQueue::NUM_BUFFER_SLOTS]; + sp<GraphicBuffer> mProducerBuffers[BufferQueueDefs::NUM_BUFFER_SLOTS]; // The QueueBufferOutput with the latest info from the sink, and with the // transform hint cleared. Since we defer queueBuffer from the GLES driver diff --git a/services/surfaceflinger/Layer.cpp b/services/surfaceflinger/Layer.cpp index 0eef708afd..9afc608f86 100644 --- a/services/surfaceflinger/Layer.cpp +++ b/services/surfaceflinger/Layer.cpp @@ -38,6 +38,7 @@ #include <ui/PixelFormat.h> #include <gui/BufferItem.h> +#include <gui/BufferQueue.h> #include <gui/Surface.h> #include "clz.h" @@ -76,6 +77,7 @@ Layer::Layer(SurfaceFlinger* flinger, const sp<Client>& client, mPendingStates(), mQueuedFrames(0), mSidebandStreamChanged(false), + mActiveBufferSlot(BufferQueue::INVALID_BUFFER_SLOT), mCurrentTransform(0), mCurrentScalingMode(NATIVE_WINDOW_SCALING_MODE_FREEZE), mOverrideScalingMode(-1), diff --git a/services/surfaceflinger/Layer.h b/services/surfaceflinger/Layer.h index 8227daec8d..bc7e39473b 100644 --- a/services/surfaceflinger/Layer.h +++ b/services/surfaceflinger/Layer.h @@ -657,7 +657,7 @@ private: FenceTimeline mReleaseTimeline; // main thread - int mActiveBufferSlot = BufferQueue::INVALID_BUFFER_SLOT; + int mActiveBufferSlot; sp<GraphicBuffer> mActiveBuffer; sp<NativeHandle> mSidebandStream; Rect mCurrentCrop; diff --git a/services/surfaceflinger/LayerRejecter.cpp b/services/surfaceflinger/LayerRejecter.cpp index 2bc0605e95..5ca7d395ae 100644 --- a/services/surfaceflinger/LayerRejecter.cpp +++ b/services/surfaceflinger/LayerRejecter.cpp @@ -16,6 +16,8 @@ #include "LayerRejecter.h" +#include <gui/BufferItem.h> + #include "clz.h" #define DEBUG_RESIZE 0 @@ -123,4 +125,4 @@ bool LayerRejecter::reject(const sp<GraphicBuffer>& buf, const BufferItem& item) return false; } -} // namespace android
\ No newline at end of file +} // namespace android diff --git a/services/surfaceflinger/SurfaceFlingerConsumer.cpp b/services/surfaceflinger/SurfaceFlingerConsumer.cpp index 942af139ec..b3346b4c5e 100644 --- a/services/surfaceflinger/SurfaceFlingerConsumer.cpp +++ b/services/surfaceflinger/SurfaceFlingerConsumer.cpp @@ -23,6 +23,7 @@ #include <private/gui/SyncFeatures.h> #include <gui/BufferItem.h> +#include <gui/BufferQueue.h> #include <utils/Errors.h> #include <utils/NativeHandle.h> diff --git a/services/surfaceflinger/SurfaceFlingerConsumer.h b/services/surfaceflinger/SurfaceFlingerConsumer.h index 7713ed2408..9b8de088cd 100644 --- a/services/surfaceflinger/SurfaceFlingerConsumer.h +++ b/services/surfaceflinger/SurfaceFlingerConsumer.h @@ -18,6 +18,8 @@ #define ANDROID_SURFACEFLINGERCONSUMER_H #include "DispSync.h" + +#include <ui/Region.h> #include <gui/GLConsumer.h> namespace android { diff --git a/services/vr/bufferhubd/Android.mk b/services/vr/bufferhubd/Android.mk index 4ba237359c..0db909ccec 100644 --- a/services/vr/bufferhubd/Android.mk +++ b/services/vr/bufferhubd/Android.mk @@ -33,7 +33,8 @@ sharedLibraries := \ libhardware \ liblog \ libsync \ - libutils + libutils \ + libgui include $(CLEAR_VARS) # Don't strip symbols so we see stack traces in logcat. diff --git a/vulkan/include/vulkan/vk_platform.h b/vulkan/include/vulkan/vk_platform.h index c2232ec83d..610c723950 100644 --- a/vulkan/include/vulkan/vk_platform.h +++ b/vulkan/include/vulkan/vk_platform.h @@ -94,7 +94,10 @@ extern "C" // controls inclusion of the extension interfaces in vulkan.h. #ifdef VK_USE_PLATFORM_ANDROID_KHR -#include <android/native_window.h> +// FIXME: this forces a dependency on libandroid.so, we can't have that right now +// because of circular dependencies. this will be resolved at a later time. +//#include <android/native_window.h> +struct ANativeWindow; #endif #ifdef VK_USE_PLATFORM_MIR_KHR |