Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
VkCV Framework
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Vulkan2021
VkCV Framework
Commits
c0d3d3c4
Commit
c0d3d3c4
authored
3 years ago
by
Mark Oliver Mints
Browse files
Options
Downloads
Patches
Plain Diff
[
#65
][Add] Compute Shader Module
parent
8331c9cf
No related branches found
No related tags found
1 merge request
!58
Resolve "Compute Pipeline"
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/vkcv/PipelineManager.cpp
+16
-3
16 additions, 3 deletions
src/vkcv/PipelineManager.cpp
src/vkcv/PipelineManager.hpp
+3
-1
3 additions, 1 deletion
src/vkcv/PipelineManager.hpp
with
19 additions
and
4 deletions
src/vkcv/PipelineManager.cpp
+
16
−
3
View file @
c0d3d3c4
...
@@ -315,10 +315,14 @@ namespace vkcv
...
@@ -315,10 +315,14 @@ namespace vkcv
return
m_Configs
.
at
(
id
);
return
m_Configs
.
at
(
id
);
}
}
PipelineHandle
PipelineManager
::
createComputePipeline
()
{
PipelineHandle
PipelineManager
::
createComputePipeline
(
const
ShaderProgram
&
shaderProgram
)
{
// Temporally handing over the Shader Program instead of a pipeline config
// TODO: Set Compute Shader Stage
// TODO: Set Compute Shader Stage
vk
::
ShaderModule
computeModule
{};
if
(
createShaderModule
(
computeModule
,
shaderProgram
,
ShaderStage
::
COMPUTE
)
!=
vk
::
Result
::
eSuccess
)
return
PipelineHandle
();
vk
::
PipelineShaderStageCreateInfo
pipelineShaderStageCreateInfo
;
// TODO: Set params
vk
::
PipelineShaderStageCreateInfo
pipelineShaderStageCreateInfo
;
// TODO: Set params
// TODO: Set Compute Pipeline Layout
// TODO: Set Compute Pipeline Layout
...
@@ -331,7 +335,16 @@ namespace vkcv
...
@@ -331,7 +335,16 @@ namespace vkcv
{
{
// TODO: Set Params
// TODO: Set Params
}
}
return
PipelineHandle
();
return
PipelineHandle
();
}
}
// There is an issue for refactoring the Pipeline Manager.
// While including Compute Pipeline Creation, some private helper functions where introduced:
vk
::
Result
PipelineManager
::
createShaderModule
(
vk
::
ShaderModule
&
module
,
const
ShaderProgram
&
shaderProgram
,
const
ShaderStage
stage
)
{
std
::
vector
<
char
>
code
=
shaderProgram
.
getShader
(
stage
).
shaderCode
;
vk
::
ShaderModuleCreateInfo
moduleInfo
({},
code
.
size
(),
reinterpret_cast
<
uint32_t
*>
(
code
.
data
()));
return
m_Device
.
createShaderModule
(
&
moduleInfo
,
nullptr
,
&
module
);
}
}
}
\ No newline at end of file
This diff is collapsed.
Click to expand it.
src/vkcv/PipelineManager.hpp
+
3
−
1
View file @
c0d3d3c4
...
@@ -21,6 +21,8 @@ namespace vkcv
...
@@ -21,6 +21,8 @@ namespace vkcv
std
::
vector
<
PipelineConfig
>
m_Configs
;
std
::
vector
<
PipelineConfig
>
m_Configs
;
void
destroyPipelineById
(
uint64_t
id
);
void
destroyPipelineById
(
uint64_t
id
);
vk
::
Result
createShaderModule
(
vk
::
ShaderModule
&
module
,
const
ShaderProgram
&
shaderProgram
,
const
ShaderStage
stage
);
public
:
public
:
PipelineManager
()
=
delete
;
// no default ctor
PipelineManager
()
=
delete
;
// no default ctor
...
@@ -35,7 +37,7 @@ namespace vkcv
...
@@ -35,7 +37,7 @@ namespace vkcv
PipelineHandle
createPipeline
(
const
PipelineConfig
&
config
,
PassManager
&
passManager
);
PipelineHandle
createPipeline
(
const
PipelineConfig
&
config
,
PassManager
&
passManager
);
PipelineHandle
createComputePipeline
();
PipelineHandle
createComputePipeline
(
const
ShaderProgram
&
shaderProgram
);
[[
nodiscard
]]
[[
nodiscard
]]
vk
::
Pipeline
getVkPipeline
(
const
PipelineHandle
&
handle
)
const
;
vk
::
Pipeline
getVkPipeline
(
const
PipelineHandle
&
handle
)
const
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment