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

Commit e2a808a3 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[base] Update deprecated GrVk type names" into main

parents 9df0be46 ab1f35fa

libs/hwui/renderthread/VulkanManager.cpp

+4 −3
Original line number Diff line number Diff line
@@ -28,8 +28,8 @@ 
#include <include/gpu/ganesh/vk/GrVkBackendSemaphore.h>

#include <include/gpu/ganesh/vk/GrVkBackendSurface.h>

#include <include/gpu/ganesh/vk/GrVkDirectContext.h>

#include <include/gpu/vk/VulkanBackendContext.h>

#include <ui/FatVector.h>

#include <vk/GrVkExtensions.h>

#include <vk/GrVkTypes.h>



#include <sstream>
@@ -141,7 +141,8 @@ VulkanManager::~VulkanManager() { 
    mPhysicalDeviceFeatures2 = {};

}



void VulkanManager::setupDevice(GrVkExtensions& grExtensions, VkPhysicalDeviceFeatures2& features) {

void VulkanManager::setupDevice(skgpu::VulkanExtensions& grExtensions,

                                VkPhysicalDeviceFeatures2& features) {

    VkResult err;



    constexpr VkApplicationInfo app_info = {
@@ -506,7 +507,7 @@ sk_sp<GrDirectContext> VulkanManager::createContext(GrContextOptions& options, 
        return vkGetInstanceProcAddr(instance, proc_name);

    };



    GrVkBackendContext backendContext;

    skgpu::VulkanBackendContext backendContext;

    backendContext.fInstance = mInstance;

    backendContext.fPhysicalDevice = mPhysicalDevice;

    backendContext.fDevice = mDevice;

libs/hwui/renderthread/VulkanManager.h

+3 −4
Original line number Diff line number Diff line
@@ -24,8 +24,7 @@ 
#include <SkSurface.h>

#include <android-base/unique_fd.h>

#include <utils/StrongPointer.h>

#include <vk/GrVkBackendContext.h>

#include <vk/GrVkExtensions.h>

#include <vk/VulkanExtensions.h>

#include <vulkan/vulkan.h>



// VK_ANDROID_frame_boundary is a bespoke extension defined by AGI
@@ -127,7 +126,7 @@ private: 


    // Sets up the VkInstance and VkDevice objects. Also fills out the passed in

    // VkPhysicalDeviceFeatures struct.

    void setupDevice(GrVkExtensions&, VkPhysicalDeviceFeatures2&);

    void setupDevice(skgpu::VulkanExtensions&, VkPhysicalDeviceFeatures2&);



    // simple wrapper class that exists only to initialize a pointer to NULL

    template <typename FNPTR_TYPE>
@@ -206,7 +205,7 @@ private: 
        BufferAge,

    };

    SwapBehavior mSwapBehavior = SwapBehavior::Discard;

    GrVkExtensions mExtensions;

    skgpu::VulkanExtensions mExtensions;

    uint32_t mDriverVersion = 0;



    std::once_flag mInitFlag;