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
74aea536
Verified
Commit
74aea536
authored
2 years ago
by
Tobias Frisch
Browse files
Options
Downloads
Patches
Plain Diff
Add fix for binding usage in multiple stages
Signed-off-by:
Tobias Frisch
<
tfrisch@uni-koblenz.de
>
parent
a9250ba2
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/vkcv/ShaderProgram.cpp
+14
-1
14 additions, 1 deletion
src/vkcv/ShaderProgram.cpp
with
14 additions
and
1 deletion
src/vkcv/ShaderProgram.cpp
+
14
−
1
View file @
74aea536
/**
/**
* @authors Simeon Hermann, Leonie Franken
* @authors Simeon Hermann, Leonie Franken
, Tobias Frisch
* @file src/vkcv/ShaderProgram.cpp
* @file src/vkcv/ShaderProgram.cpp
* @brief ShaderProgram class to handle and prepare the shader stages for a graphics pipeline
* @brief ShaderProgram class to handle and prepare the shader stages for a graphics pipeline
*/
*/
...
@@ -165,6 +165,8 @@ namespace vkcv {
...
@@ -165,6 +165,8 @@ namespace vkcv {
auto
insertionResult
=
auto
insertionResult
=
m_DescriptorSets
[
setID
].
insert
(
std
::
make_pair
(
bindingID
,
binding
));
m_DescriptorSets
[
setID
].
insert
(
std
::
make_pair
(
bindingID
,
binding
));
if
(
!
insertionResult
.
second
)
{
if
(
!
insertionResult
.
second
)
{
insertionResult
.
first
->
second
.
shaderStages
|=
shaderStage
;
vkcv_log
(
LogLevel
::
WARNING
,
vkcv_log
(
LogLevel
::
WARNING
,
"Attempting to overwrite already existing binding %u at set ID %u."
,
"Attempting to overwrite already existing binding %u at set ID %u."
,
bindingID
,
setID
);
bindingID
,
setID
);
...
@@ -197,6 +199,8 @@ namespace vkcv {
...
@@ -197,6 +199,8 @@ namespace vkcv {
auto
insertionResult
=
auto
insertionResult
=
m_DescriptorSets
[
setID
].
insert
(
std
::
make_pair
(
bindingID
,
binding
));
m_DescriptorSets
[
setID
].
insert
(
std
::
make_pair
(
bindingID
,
binding
));
if
(
!
insertionResult
.
second
)
{
if
(
!
insertionResult
.
second
)
{
insertionResult
.
first
->
second
.
shaderStages
|=
shaderStage
;
vkcv_log
(
LogLevel
::
WARNING
,
vkcv_log
(
LogLevel
::
WARNING
,
"Attempting to overwrite already existing binding %u at set ID %u."
,
"Attempting to overwrite already existing binding %u at set ID %u."
,
bindingID
,
setID
);
bindingID
,
setID
);
...
@@ -228,6 +232,8 @@ namespace vkcv {
...
@@ -228,6 +232,8 @@ namespace vkcv {
auto
insertionResult
=
auto
insertionResult
=
m_DescriptorSets
[
setID
].
insert
(
std
::
make_pair
(
bindingID
,
binding
));
m_DescriptorSets
[
setID
].
insert
(
std
::
make_pair
(
bindingID
,
binding
));
if
(
!
insertionResult
.
second
)
{
if
(
!
insertionResult
.
second
)
{
insertionResult
.
first
->
second
.
shaderStages
|=
shaderStage
;
vkcv_log
(
LogLevel
::
WARNING
,
vkcv_log
(
LogLevel
::
WARNING
,
"Attempting to overwrite already existing binding %u at set ID %u."
,
"Attempting to overwrite already existing binding %u at set ID %u."
,
bindingID
,
setID
);
bindingID
,
setID
);
...
@@ -260,6 +266,8 @@ namespace vkcv {
...
@@ -260,6 +266,8 @@ namespace vkcv {
auto
insertionResult
=
auto
insertionResult
=
m_DescriptorSets
[
setID
].
insert
(
std
::
make_pair
(
bindingID
,
binding
));
m_DescriptorSets
[
setID
].
insert
(
std
::
make_pair
(
bindingID
,
binding
));
if
(
!
insertionResult
.
second
)
{
if
(
!
insertionResult
.
second
)
{
insertionResult
.
first
->
second
.
shaderStages
|=
shaderStage
;
vkcv_log
(
LogLevel
::
WARNING
,
vkcv_log
(
LogLevel
::
WARNING
,
"Attempting to overwrite already existing binding %u at set ID %u."
,
"Attempting to overwrite already existing binding %u at set ID %u."
,
bindingID
,
setID
);
bindingID
,
setID
);
...
@@ -292,6 +300,8 @@ namespace vkcv {
...
@@ -292,6 +300,8 @@ namespace vkcv {
auto
insertionResult
=
auto
insertionResult
=
m_DescriptorSets
[
setID
].
insert
(
std
::
make_pair
(
bindingID
,
binding
));
m_DescriptorSets
[
setID
].
insert
(
std
::
make_pair
(
bindingID
,
binding
));
if
(
!
insertionResult
.
second
)
{
if
(
!
insertionResult
.
second
)
{
insertionResult
.
first
->
second
.
shaderStages
|=
shaderStage
;
vkcv_log
(
LogLevel
::
WARNING
,
vkcv_log
(
LogLevel
::
WARNING
,
"Attempting to overwrite already existing binding %u at set ID %u."
,
"Attempting to overwrite already existing binding %u at set ID %u."
,
bindingID
,
setID
);
bindingID
,
setID
);
...
@@ -315,6 +325,8 @@ namespace vkcv {
...
@@ -315,6 +325,8 @@ namespace vkcv {
auto
insertionResult
=
auto
insertionResult
=
m_DescriptorSets
[
setID
].
insert
(
std
::
make_pair
(
bindingID
,
binding
));
m_DescriptorSets
[
setID
].
insert
(
std
::
make_pair
(
bindingID
,
binding
));
if
(
!
insertionResult
.
second
)
{
if
(
!
insertionResult
.
second
)
{
insertionResult
.
first
->
second
.
shaderStages
|=
shaderStage
;
vkcv_log
(
LogLevel
::
WARNING
,
vkcv_log
(
LogLevel
::
WARNING
,
"Attempting to overwrite already existing binding %u at set ID %u."
,
"Attempting to overwrite already existing binding %u at set ID %u."
,
bindingID
,
setID
);
bindingID
,
setID
);
...
@@ -343,3 +355,4 @@ namespace vkcv {
...
@@ -343,3 +355,4 @@ namespace vkcv {
return
m_pushConstantsSize
;
return
m_pushConstantsSize
;
}
}
}
// namespace vkcv
}
// namespace vkcv
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