Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ea4f5ef0 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "vulkan: respect consumer default dataspace upon PASS_THROUGH" am:... 

Merge "vulkan: respect consumer default dataspace upon PASS_THROUGH" am: eae8088c am: 885d6146 am: 643895a5 am: 06141f43

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2162752



Change-Id: Iaa1b6547e19bdec5841467c62157919fb2e04523
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 453702f6 06141f43

libs/gui/Surface.cpp

+1 −0
Original line number Diff line number Diff line
@@ -1943,6 +1943,7 @@ int Surface::disconnect(int api, IGraphicBufferProducer::DisconnectMode mode) { 
        mReqHeight = 0;

        mReqUsage = 0;

        mCrop.clear();

        mDataSpace = Dataspace::UNKNOWN;

        mScalingMode = NATIVE_WINDOW_SCALING_MODE_FREEZE;

        mTransform = 0;

        mStickyTransform = 0;

vulkan/libvulkan/swapchain.cpp

+9 −5
Original line number Diff line number Diff line
@@ -1238,12 +1238,16 @@ VkResult CreateSwapchainKHR(VkDevice device, 
              decodePixelFormat(native_pixel_format).c_str(), strerror(-err), err);

        return VK_ERROR_SURFACE_LOST_KHR;

    }



    /* Respect consumer default dataspace upon HAL_DATASPACE_ARBITRARY. */

    if (native_dataspace != HAL_DATASPACE_ARBITRARY) {

        err = native_window_set_buffers_data_space(window, native_dataspace);

        if (err != android::OK) {

            ALOGE("native_window_set_buffers_data_space(%d) failed: %s (%d)",

                  native_dataspace, strerror(-err), err);

            return VK_ERROR_SURFACE_LOST_KHR;

        }

    }



    err = native_window_set_buffers_dimensions(

        window, static_cast<int>(create_info->imageExtent.width),