Skip to content

Commit

Permalink
[fuchsia] change VulkanRasterizer member ordering to avoid crashes du…
Browse files Browse the repository at this point in the history
…ring teardown on device shell logout (flutter#3597)
  • Loading branch information
freiling authored Apr 17, 2017
1 parent 51adf04 commit 3950f0f
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions content_handler/vulkan_rasterizer.h
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,10 @@ class VulkanRasterizer : public Rasterizer {
}

ftl::RefPtr<vulkan::VulkanProcTable> vk_;
std::unique_ptr<vulkan::VulkanApplication> application_;
std::unique_ptr<vulkan::VulkanDevice> logical_device_;
sk_sp<GrVkBackendContext> backend_context_;
sk_sp<GrContext> context_;

// These three containers hold surfaces in various stages of recycling

Expand All @@ -121,11 +125,6 @@ class VulkanRasterizer : public Rasterizer {
// Surfaces exist in pendind surfaces until they are released by the buffer
// consumer
std::unordered_map<mx_handle_t, PendingSurfaceInfo> pending_surfaces_;

sk_sp<GrContext> context_;
sk_sp<GrVkBackendContext> backend_context_;
std::unique_ptr<vulkan::VulkanApplication> application_;
std::unique_ptr<vulkan::VulkanDevice> logical_device_;
bool valid_;

bool Initialize();
Expand Down

0 comments on commit 3950f0f

Please sign in to comment.