Skip to content

Commit 4605ac9

Browse files
Remove unused fields from VulkanDevice::InvocationState. (#1324)
These fields were supposed to be removed in earlier PRs that replaced the use of them with an abstract API.
1 parent 1f92982 commit 4605ac9

1 file changed

Lines changed: 0 additions & 34 deletions

File tree

lib/API/VK/Device.cpp

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1584,16 +1584,12 @@ class VulkanDevice : public offloadtest::Device {
15841584
// Lifetime-tied to the pipeline; only set for RT pipelines.
15851585
std::unique_ptr<offloadtest::ShaderBindingTable> SBT;
15861586

1587-
// FrameBuffer associated data for offscreen rendering.
1588-
VkFramebuffer FrameBuffer = VK_NULL_HANDLE;
15891587
std::unique_ptr<offloadtest::RenderPass> RenderPass;
15901588
std::unique_ptr<offloadtest::Texture> RenderTarget;
15911589
std::unique_ptr<offloadtest::Buffer> RTReadback;
15921590
std::unique_ptr<offloadtest::Texture> DepthStencil;
15931591
std::unique_ptr<offloadtest::Buffer> VB;
15941592

1595-
uint32_t ShaderStageMask = 0;
1596-
15971593
llvm::SmallVector<ResourceBundle> Resources;
15981594
llvm::SmallVector<VkDescriptorSet> DescriptorSets;
15991595
llvm::SmallVector<VkBufferView> BufferViews;
@@ -3925,29 +3921,6 @@ class VulkanDevice : public offloadtest::Device {
39253921
return llvm::Error::success();
39263922
}
39273923

3928-
llvm::Error createFrameBuffer(InvocationState &IS) {
3929-
auto &RT = llvm::cast<VulkanTexture>(*IS.RenderTarget);
3930-
auto &DS = llvm::cast<VulkanTexture>(*IS.DepthStencil);
3931-
3932-
std::array<VkImageView, 2> Views = {RT.View, DS.View};
3933-
3934-
VkFramebufferCreateInfo FbufCreateInfo = {};
3935-
FbufCreateInfo.sType = VK_STRUCTURE_TYPE_FRAMEBUFFER_CREATE_INFO;
3936-
FbufCreateInfo.renderPass =
3937-
llvm::cast<VulkanRenderPass>(*IS.RenderPass).Handle;
3938-
FbufCreateInfo.attachmentCount = Views.size();
3939-
FbufCreateInfo.pAttachments = Views.data();
3940-
FbufCreateInfo.width = RT.Desc.Width;
3941-
FbufCreateInfo.height = RT.Desc.Height;
3942-
FbufCreateInfo.layers = 1;
3943-
3944-
if (auto Err = VK::toError(vkCreateFramebuffer(Device, &FbufCreateInfo,
3945-
nullptr, &IS.FrameBuffer),
3946-
"Failed to create frame buffer."))
3947-
return Err;
3948-
return llvm::Error::success();
3949-
}
3950-
39513924
static llvm::Expected<VkSpecializationMapEntry>
39523925
parseSpecializationConstant(const SpecializationConstant &SpecConst,
39533926
llvm::SmallVectorImpl<char> &SpecData) {
@@ -4559,9 +4532,6 @@ class VulkanDevice : public offloadtest::Device {
45594532
}
45604533
}
45614534

4562-
if (IS.FrameBuffer)
4563-
vkDestroyFramebuffer(Device, IS.FrameBuffer, nullptr);
4564-
45654535
if (IS.Pool)
45664536
vkDestroyDescriptorPool(Device, IS.Pool, nullptr);
45674537
}
@@ -4736,10 +4706,6 @@ class VulkanDevice : public offloadtest::Device {
47364706
State.Pipeline = std::move(*PipelineStateOrErr);
47374707
llvm::outs() << "Mesh Shader Pipeline created.\n";
47384708
}
4739-
4740-
if (auto Err = createFrameBuffer(State))
4741-
return Err;
4742-
llvm::outs() << "Frame buffer created.\n";
47434709
} else if (P.isRayTracing()) {
47444710
if (P.Shaders.empty() || !P.SBT || !P.RTConfig)
47454711
return llvm::createStringError(

0 commit comments

Comments
 (0)