Skip to content

Commit

Permalink
Fix Linux build
Browse files Browse the repository at this point in the history
  • Loading branch information
@egorodet
egorodet committed Nov 8, 2022
1 parent 3cdec00 commit f4421ce
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions Modules/Graphics/Core/Vulkan/Include/Methane/Graphics/Vulkan/IResourceVk.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ struct IResourceVk : virtual IResource // NOSONAR
using Barrier = IResource::Barrier;
using Barriers = IResourceBarriers;
using State = IResource::State;
using View = ResourceView;
using Views = ResourceViews;
using View = ResourceView;
using Views = ResourceViews;

[[nodiscard]] virtual const IContextVk& GetVulkanContext() const noexcept = 0;
[[nodiscard]] virtual const vk::DeviceMemory& GetNativeDeviceMemory() const noexcept = 0;
Expand Down
8 changes: 4 additions & 4 deletions Modules/Graphics/Core/Vulkan/Include/Methane/Graphics/Vulkan/Texture.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ class FrameBufferTexture final // NOSONAR - inheritance hierarchy is greater tha

private:
// Resource override
Ptr<ResourceView::ViewDescriptorVariant> CreateNativeViewDescriptor(const View::Id& view_id) override;
Ptr<ResourceView::ViewDescriptorVariant> CreateNativeViewDescriptor(const ResourceView::Id& view_id) override;

// IResource interface
void SetData(const SubResources& sub_resources, ICommandQueue&) override;
Expand All @@ -91,7 +91,7 @@ class DepthStencilTexture final // NOSONAR - inheritance hierarchy is greater th

private:
// Resource override
Ptr<ResourceView::ViewDescriptorVariant> CreateNativeViewDescriptor(const View::Id& view_id) override;
Ptr<ResourceView::ViewDescriptorVariant> CreateNativeViewDescriptor(const ResourceView::Id& view_id) override;

Opt<DepthStencil> m_depth_stencil_opt;
};
Expand All @@ -112,7 +112,7 @@ class RenderTargetTexture final // NOSONAR - inheritance hierarchy is greater th

private:
// Resource override
Ptr<ResourceView::ViewDescriptorVariant> CreateNativeViewDescriptor(const View::Id& view_id) override;
Ptr<ResourceView::ViewDescriptorVariant> CreateNativeViewDescriptor(const ResourceView::Id& view_id) override;
};

class ImageTexture final // NOSONAR - inheritance hierarchy is greater than 5
Expand All @@ -134,7 +134,7 @@ class ImageTexture final // NOSONAR - inheritance hierarchy is greater than 5

private:
// Resource override
Ptr<ResourceView::ViewDescriptorVariant> CreateNativeViewDescriptor(const View::Id& view_id) override;
Ptr<ResourceView::ViewDescriptorVariant> CreateNativeViewDescriptor(const ResourceView::Id& view_id) override;

void GenerateMipLevels(ICommandQueue& target_cmd_queue, State target_resource_state);

Expand Down
8 changes: 4 additions & 4 deletions Modules/Graphics/Core/Vulkan/Sources/Methane/Graphics/Vulkan/Texture.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ vk::ImageSubresourceRange FrameBufferTexture::GetNativeSubresourceRange() const
);
}

Ptr<ResourceView::ViewDescriptorVariant> FrameBufferTexture::CreateNativeViewDescriptor(const View::Id& view_id)
Ptr<ResourceView::ViewDescriptorVariant> FrameBufferTexture::CreateNativeViewDescriptor(const ResourceView::Id& view_id)
{
META_FUNCTION_TASK();
return CreateNativeImageViewDescriptor(view_id, GetSettings(), GetSubresourceCount(), GetName(), GetNativeDevice(), GetNativeImage());
Expand Down Expand Up @@ -344,7 +344,7 @@ vk::ImageSubresourceRange DepthStencilTexture::GetNativeSubresourceRange() const
);
}

Ptr<ResourceView::ViewDescriptorVariant> DepthStencilTexture::CreateNativeViewDescriptor(const View::Id& view_id)
Ptr<ResourceView::ViewDescriptorVariant> DepthStencilTexture::CreateNativeViewDescriptor(const ResourceView::Id& view_id)
{
META_FUNCTION_TASK();
return CreateNativeImageViewDescriptor(view_id, GetSettings(), GetSubresourceCount(), GetName(), GetNativeDevice(), GetNativeImage());
Expand Down Expand Up @@ -376,7 +376,7 @@ vk::ImageSubresourceRange RenderTargetTexture::GetNativeSubresourceRange() const
);
}

Ptr<ResourceView::ViewDescriptorVariant> RenderTargetTexture::CreateNativeViewDescriptor(const View::Id& view_id)
Ptr<ResourceView::ViewDescriptorVariant> RenderTargetTexture::CreateNativeViewDescriptor(const ResourceView::Id& view_id)
{
META_FUNCTION_TASK();
return CreateNativeImageViewDescriptor(view_id, GetSettings(), GetSubresourceCount(), GetName(), GetNativeDevice(), GetNativeImage());
Expand Down Expand Up @@ -607,7 +607,7 @@ vk::ImageSubresourceRange ImageTexture::GetNativeSubresourceRange() const noexce
);
}

Ptr<ResourceView::ViewDescriptorVariant> ImageTexture::CreateNativeViewDescriptor(const View::Id& view_id)
Ptr<ResourceView::ViewDescriptorVariant> ImageTexture::CreateNativeViewDescriptor(const ResourceView::Id& view_id)
{
META_FUNCTION_TASK();
return CreateNativeImageViewDescriptor(view_id, GetSettings(), GetSubresourceCount(), GetName(), GetNativeDevice(), GetNativeImage());
Expand Down

9 comments on commit f4421ce

@github-actions
Copy link

Choose a reason for hiding this comment

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

Win32_DX_Release Test Results

  • ✅ 2755 tests passed
  • ❌ 0 tests failed
  • ⚠️ 0 tests skipped
  • ⏱️ 125 ms. run duration

@github-actions
Copy link

Choose a reason for hiding this comment

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

Win32_VK_Release Test Results

  • ✅ 2755 tests passed
  • ❌ 0 tests failed
  • ⚠️ 0 tests skipped
  • ⏱️ 111 ms. run duration

@github-actions
Copy link

Choose a reason for hiding this comment

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

Ubuntu_VK_Release Test Results

  • ✅ 2756 tests passed
  • ❌ 0 tests failed
  • ⚠️ 0 tests skipped
  • ⏱️ 13497 ms. run duration

@github-actions
Copy link

Choose a reason for hiding this comment

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

MacOS_MTL_Release Test Results

  • ✅ 2755 tests passed
  • ❌ 0 tests failed
  • ⚠️ 0 tests skipped
  • ⏱️ 72 ms. run duration

@github-actions
Copy link

Choose a reason for hiding this comment

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

Win64_DX_Release Test Results

  • ✅ 2755 tests passed
  • ❌ 0 tests failed
  • ⚠️ 0 tests skipped
  • ⏱️ 109 ms. run duration

@github-actions
Copy link

Choose a reason for hiding this comment

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

Win64_VK_Release Test Results

  • ✅ 2755 tests passed
  • ❌ 0 tests failed
  • ⚠️ 0 tests skipped
  • ⏱️ 85 ms. run duration

@github-actions
Copy link

Choose a reason for hiding this comment

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

Win64_DX_SonarScan Tests Code Coverage

Code Coverage

Package Line Rate Branch Rate Health
D:\a\MethaneKit\MethaneKit\Build\Output\VS2019-Win64-DX-Scan\Install\Tests\MethaneDataEventsTest.exe 94% 100% ✔
D:\a\MethaneKit\MethaneKit\Build\Output\VS2019-Win64-DX-Scan\Install\Tests\MethaneDataRangeSetTest.exe 91% 100% ✔
D:\a\MethaneKit\MethaneKit\Build\Output\VS2019-Win64-DX-Scan\Install\Tests\MethaneDataTypesTest.exe 98% 100% ✔
D:\a\MethaneKit\MethaneKit\Build\Output\VS2019-Win64-DX-Scan\Install\Tests\MethaneGraphicsCameraTest.exe 62% 100% ➖
D:\a\MethaneKit\MethaneKit\Build\Output\VS2019-Win64-DX-Scan\Install\Tests\MethaneGraphicsTypesTest.exe 98% 100% ✔
D:\a\MethaneKit\MethaneKit\Build\Output\VS2019-Win64-DX-Scan\Install\Tests\MethanePlatformInputTest.exe 40% 100% ➖
D:\a\MethaneKit\MethaneKit\Build\Output\VS2019-Win64-DX-Scan\Install\Tests\MethaneUserInterfaceTypesTest.exe 81% 100% ✔
Summary 77% (1705 / 2217) 100% (0 / 0) ➖

@github-actions
Copy link

Choose a reason for hiding this comment

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

MacOS_MTL_SonarScan Tests Code Coverage

Code Coverage

Package Line Rate Branch Rate Health
Default 45% 22% ➖
Summary 45% (7782 / 17246) 22% (3044 / 13792) ➖

@github-actions
Copy link

Choose a reason for hiding this comment

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

Ubuntu_VK_SonarScan Tests Code Coverage

Code Coverage

Package Line Rate Branch Rate Health
Default 25% 100% ➖
Summary 25% (3824 / 15451) 100% (0 / 0) ➖

Please sign in to comment.