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

Share Android surface GrDirectContext #23798

Merged
merged 8 commits into from
Jan 22, 2021
Merged

Share Android surface GrDirectContext #23798

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8808370
make AndroidSurfaceGL share GrDirectContext within an AndroidContext
xster Jan 20, 2021
96ab5e0
fix existing unit tests
xster Jan 20, 2021
32f1a18
fix more tests
xster Jan 20, 2021
f5cafe9
hook up vulkan
xster Jan 21, 2021
60222a8
fix bug
xster Jan 21, 2021
bde08f9
review
xster Jan 22, 2021
161f944
nit
xster Jan 22, 2021
274acae
autoformat
xster Jan 22, 2021
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
2 changes: 1 addition & 1 deletion shell/gpu/gpu_surface_vulkan.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ GPUSurfaceVulkan::GPUSurfaceVulkan(
GPUSurfaceVulkanDelegate* delegate,
std::unique_ptr<vulkan::VulkanNativeSurface> native_surface,
bool render_to_surface)
: GPUSurfaceVulkan(nullptr,
: GPUSurfaceVulkan(nullptr /* GrDirectContext */,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The proper way to comment these is with /*foobar=*/, where foobar is the name of the parameter according to the declaration.

https://google.github.io/styleguide/cppguide.html#Function_Argument_Comments

delegate,
std::move(native_surface),
render_to_surface) {}
Expand Down
2 changes: 1 addition & 1 deletion vulkan/vulkan_window.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ namespace vulkan {
VulkanWindow::VulkanWindow(fml::RefPtr<VulkanProcTable> proc_table,
std::unique_ptr<VulkanNativeSurface> native_surface,
bool render_to_surface)
: VulkanWindow(nullptr,
: VulkanWindow(nullptr /* GrDirectContext */,
proc_table,
std::move(native_surface),
render_to_surface) {}
Expand Down