Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Update to use GrDirectContexts::MakeVulkan #46878

Merged
kjlubick merged 1 commit into from
Oct 13, 2023
Merged

Update to use GrDirectContexts::MakeVulkan #46878

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion shell/common/shell_test_platform_view_vulkan.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@

#include "third_party/skia/include/core/SkSurface.h"
#include "third_party/skia/include/gpu/ganesh/SkSurfaceGanesh.h"
#include "third_party/skia/include/gpu/ganesh/vk/GrVkDirectContext.h"

#if OS_FUCHSIA
#define VULKAN_SO_PATH "libvulkan.so"
Expand Down Expand Up @@ -138,7 +139,7 @@ bool ShellTestPlatformViewVulkan::OffScreenSurface::CreateSkiaGrContext() {
MakeDefaultContextOptions(ContextType::kRender, GrBackendApi::kVulkan);

sk_sp<GrDirectContext> context =
GrDirectContext::MakeVulkan(backend_context, options);
GrDirectContexts::MakeVulkan(backend_context, options);

if (context == nullptr) {
FML_DLOG(ERROR) << "Failed to create GrDirectContext";
Expand Down
3 changes: 2 additions & 1 deletion shell/platform/embedder/embedder_surface_vulkan.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
#include "include/gpu/GrDirectContext.h"
#include "include/gpu/vk/GrVkBackendContext.h"
#include "include/gpu/vk/GrVkExtensions.h"
#include "third_party/skia/include/gpu/ganesh/vk/GrVkDirectContext.h"

namespace flutter {

Expand Down Expand Up @@ -171,7 +172,7 @@ sk_sp<GrDirectContext> EmbedderSurfaceVulkan::CreateGrContext(
GrContextOptions options =
MakeDefaultContextOptions(context_type, GrBackendApi::kVulkan);
options.fReduceOpsTaskSplitting = GrContextOptions::Enable::kNo;
return GrDirectContext::MakeVulkan(backend_context, options);
return GrDirectContexts::MakeVulkan(backend_context, options);
}

} // namespace flutter
3 changes: 2 additions & 1 deletion shell/platform/fuchsia/flutter/vulkan_surface_producer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
#include "third_party/skia/include/gpu/GrBackendSurface.h"
#include "third_party/skia/include/gpu/ganesh/SkSurfaceGanesh.h"
#include "third_party/skia/include/gpu/ganesh/vk/GrVkBackendSurface.h"
#include "third_party/skia/include/gpu/ganesh/vk/GrVkDirectContext.h"
#include "third_party/skia/include/gpu/vk/GrVkBackendContext.h"
#include "third_party/skia/include/gpu/vk/GrVkExtensions.h"
#include "third_party/skia/include/gpu/vk/GrVkTypes.h"
Expand Down Expand Up @@ -153,7 +154,7 @@ bool VulkanSurfaceProducer::Initialize() {
GrContextOptions options;
options.fReduceOpsTaskSplitting = GrContextOptions::Enable::kNo;

context_ = GrDirectContext::MakeVulkan(backend_context, options);
context_ = GrDirectContexts::MakeVulkan(backend_context, options);

if (context_ == nullptr) {
FML_LOG(ERROR)
Expand Down
3 changes: 2 additions & 1 deletion testing/test_vulkan_context.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
#include "flutter/vulkan/swiftshader_path.h"
#include "third_party/skia/include/core/SkSurface.h"
#include "third_party/skia/include/gpu/GrDirectContext.h"
#include "third_party/skia/include/gpu/ganesh/vk/GrVkDirectContext.h"
#include "third_party/skia/include/gpu/vk/GrVkExtensions.h"
#include "vulkan/vulkan_core.h"

Expand Down Expand Up @@ -106,7 +107,7 @@ TestVulkanContext::TestVulkanContext() {
GrContextOptions options =
MakeDefaultContextOptions(ContextType::kRender, GrBackendApi::kVulkan);
options.fReduceOpsTaskSplitting = GrContextOptions::Enable::kNo;
context_ = GrDirectContext::MakeVulkan(backend_context, options);
context_ = GrDirectContexts::MakeVulkan(backend_context, options);
}

TestVulkanContext::~TestVulkanContext() {
Expand Down
3 changes: 2 additions & 1 deletion vulkan/vulkan_window.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

#include "third_party/skia/include/core/SkSurface.h"
#include "third_party/skia/include/gpu/GrDirectContext.h"
#include "third_party/skia/include/gpu/ganesh/vk/GrVkDirectContext.h"

namespace vulkan {

Expand Down Expand Up @@ -128,7 +129,7 @@ bool VulkanWindow::CreateSkiaGrContext() {
GrContextOptions options;
options.fReduceOpsTaskSplitting = GrContextOptions::Enable::kNo;
sk_sp<GrDirectContext> context =
GrDirectContext::MakeVulkan(backend_context, options);
GrDirectContexts::MakeVulkan(backend_context, options);

if (context == nullptr) {
return false;
Expand Down