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

Commit 0f805fb2 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 7257953 from cfda9aaf to sc-release 

Change-Id: I5aa8f1e9dc5c43f643e103cccd9b7f42398446ff
parents f23e4f40 cfda9aaf

services/surfaceflinger/CompositionEngine/src/planner/CachedSet.cpp

+2 −1
Original line number Diff line number Diff line
@@ -178,6 +178,7 @@ void CachedSet::render(renderengine::RenderEngine& renderEngine, 
    };



    std::vector<renderengine::LayerSettings> layerSettings;

    renderengine::LayerSettings highlight;

    for (const auto& layer : mLayers) {

        const auto clientCompositionList =

                layer.getState()->getOutputLayer()->getLayerFE().prepareClientCompositionList(
@@ -192,7 +193,7 @@ void CachedSet::render(renderengine::RenderEngine& renderEngine, 
                   [](const renderengine::LayerSettings& settings) { return &settings; });



    if (sDebugHighlighLayers) {

        renderengine::LayerSettings highlight{

        highlight = {

                .geometry =

                        renderengine::Geometry{

                                .boundaries = FloatRect(0.0f, 0.0f,

vulkan/vkjson/vkjson_instance.cc

+4 −0
Original line number Diff line number Diff line
@@ -363,6 +363,10 @@ VkJsonInstance VkJsonGetInstance() { 
  VkJsonDeviceGroup device_group;

  std::vector<VkPhysicalDeviceGroupProperties> group_properties;

  group_properties.resize(count);

  for (auto& properties : group_properties) {

    properties.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_GROUP_PROPERTIES;

    properties.pNext = nullptr;

  }

  result = vkEnumeratePhysicalDeviceGroups(vkinstance, &count,

                                           group_properties.data());

  if (result != VK_SUCCESS) {