Commit e9b68f33 by Emircan Uysaler Committed by Commit Bot

Clean unused NewCreateImagePipeCmd

This call is to be deprecated. Bug: angleproject:3905 Change-Id: Iffca3a3bee4d0ff930598635a27592e068696bbf Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1925032 Commit-Queue: Michael Spang <spang@chromium.org> Reviewed-by: 's avatarMichael Spang <spang@chromium.org>
parent 6430e5e0
...@@ -1136,7 +1136,6 @@ foreach(is_shared_library, ...@@ -1136,7 +1136,6 @@ foreach(is_shared_library,
sources += util_fuchsia_sources sources += util_fuchsia_sources
public_deps += [ public_deps += [
"$angle_root/src/common/fuchsia_egl", "$angle_root/src/common/fuchsia_egl",
"src/libANGLE/renderer/vulkan:angle_vulkan",
"//third_party/fuchsia-sdk/sdk:async_loop_cpp", "//third_party/fuchsia-sdk/sdk:async_loop_cpp",
"//third_party/fuchsia-sdk/sdk:async_loop_default", "//third_party/fuchsia-sdk/sdk:async_loop_default",
"//third_party/fuchsia-sdk/sdk:fdio", "//third_party/fuchsia-sdk/sdk:fdio",
......
...@@ -18,7 +18,6 @@ ...@@ -18,7 +18,6 @@
#include <lib/fidl/cpp/interface_request.h> #include <lib/fidl/cpp/interface_request.h>
#include <lib/ui/scenic/cpp/view_token_pair.h> #include <lib/ui/scenic/cpp/view_token_pair.h>
#include <lib/zx/channel.h> #include <lib/zx/channel.h>
#include <vulkan/vulkan.h>
#include <zircon/status.h> #include <zircon/status.h>
#include "common/debug.h" #include "common/debug.h"
...@@ -26,36 +25,6 @@ ...@@ -26,36 +25,6 @@
namespace namespace
{ {
uint32_t GetImagePipeSwapchainLayerImplementationVersion()
{
uint32_t numInstanceLayers = 0;
VkResult result = vkEnumerateInstanceLayerProperties(&numInstanceLayers, nullptr);
if (result != VK_SUCCESS)
{
return 0u;
}
std::vector<VkLayerProperties> instanceLayers(numInstanceLayers);
result = vkEnumerateInstanceLayerProperties(&numInstanceLayers, instanceLayers.data());
if (result != VK_SUCCESS)
{
return 0u;
}
uint32_t imagePipeSwapchainImplementationVersion = 0;
const std::string layerName = "VK_LAYER_FUCHSIA_imagepipe_swapchain";
for (const VkLayerProperties &layerProperty : instanceLayers)
{
if (layerName.compare(layerProperty.layerName) != 0)
continue;
imagePipeSwapchainImplementationVersion = layerProperty.implementationVersion;
break;
}
ASSERT(imagePipeSwapchainImplementationVersion > 0u);
return imagePipeSwapchainImplementationVersion;
}
async::Loop *GetDefaultLoop() async::Loop *GetDefaultLoop()
{ {
static async::Loop *defaultLoop = new async::Loop(&kAsyncLoopConfigAttachToCurrentThread); static async::Loop *defaultLoop = new async::Loop(&kAsyncLoopConfigAttachToCurrentThread);
...@@ -138,20 +107,11 @@ void ScenicWindow::destroy() ...@@ -138,20 +107,11 @@ void ScenicWindow::destroy()
void ScenicWindow::resetNativeWindow() void ScenicWindow::resetNativeWindow()
{ {
zx_handle_t imagePipeHandle = 0; fuchsia::images::ImagePipe2Ptr imagePipe;
uint32_t imagePipeId = mScenicSession.AllocResourceId(); uint32_t imagePipeId = mScenicSession.AllocResourceId();
if (GetImagePipeSwapchainLayerImplementationVersion() > 1u) mScenicSession.Enqueue(scenic::NewCreateImagePipe2Cmd(imagePipeId, imagePipe.NewRequest()));
{ zx_handle_t imagePipeHandle = imagePipe.Unbind().TakeChannel().release();
fuchsia::images::ImagePipe2Ptr imagePipe;
mScenicSession.Enqueue(scenic::NewCreateImagePipe2Cmd(imagePipeId, imagePipe.NewRequest()));
imagePipeHandle = imagePipe.Unbind().TakeChannel().release();
}
else
{
fuchsia::images::ImagePipePtr imagePipe;
mScenicSession.Enqueue(scenic::NewCreateImagePipeCmd(imagePipeId, imagePipe.NewRequest()));
imagePipeHandle = imagePipe.Unbind().TakeChannel().release();
}
mMaterial.SetTexture(imagePipeId); mMaterial.SetTexture(imagePipeId);
mScenicSession.ReleaseResource(imagePipeId); mScenicSession.ReleaseResource(imagePipeId);
mScenicSession.Present(0, [](fuchsia::images::PresentationInfo info) {}); mScenicSession.Present(0, [](fuchsia::images::PresentationInfo info) {});
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment