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

Commit 0fd47717 authored by Chih-hung Hsieh's avatar Chih-hung Hsieh Committed by android-build-merger
Browse files

Merge "Fix google-explicit-constructor warnings in vulkan." am: 476e5178 

am: 0391054e

Change-Id: Ie91da4808c3dc15bb16456ae6288b5fe54c20e93
parents df34094a 0391054e

vulkan/libvulkan/debug_report.h

+2 −2
Original line number Diff line number Diff line
@@ -85,9 +85,9 @@ class DebugReportCallbackList { 


class DebugReportLogger {

   public:

    DebugReportLogger(const VkInstanceCreateInfo& info)

    explicit DebugReportLogger(const VkInstanceCreateInfo& info)

        : instance_pnext_(info.pNext), callbacks_(nullptr) {}

    DebugReportLogger(const DebugReportCallbackList& callbacks)

    explicit DebugReportLogger(const DebugReportCallbackList& callbacks)

        : instance_pnext_(nullptr), callbacks_(&callbacks) {}



    void Message(VkDebugReportFlagsEXT flags,

vulkan/libvulkan/driver.h

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ VK_DEFINE_HANDLE(InstanceDispatchable) 
VK_DEFINE_HANDLE(DeviceDispatchable)



struct InstanceData {

    InstanceData(const VkAllocationCallbacks& alloc)

    explicit InstanceData(const VkAllocationCallbacks& alloc)

        : opaque_api_data(),

          allocator(alloc),

          driver(),

vulkan/libvulkan/layers_extensions.h

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ struct Layer; 


class LayerRef {

   public:

    LayerRef(const Layer* layer);

    explicit LayerRef(const Layer* layer);

    LayerRef(LayerRef&& other);

    ~LayerRef();

    LayerRef(const LayerRef&) = delete;