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
07b4b3f3
Commit
07b4b3f3
authored
3 years ago
by
Simeon Hermann
Browse files
Options
Downloads
Patches
Plain Diff
[
#9
] removed some unnecessary namespace references
parent
7fe1bb8b
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!3
Resolve "Descriptor Set Managment"
Pipeline
#25075
failed
3 years ago
Stage: build
Stage: deploy
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/vkcv/DescriptorManager.cpp
+9
-9
9 additions, 9 deletions
src/vkcv/DescriptorManager.cpp
src/vkcv/DescriptorManager.hpp
+1
-1
1 addition, 1 deletion
src/vkcv/DescriptorManager.hpp
with
10 additions
and
10 deletions
src/vkcv/DescriptorManager.cpp
+
9
−
9
View file @
07b4b3f3
...
@@ -59,11 +59,11 @@ namespace vkcv
...
@@ -59,11 +59,11 @@ namespace vkcv
vk
::
DescriptorType
DescriptorManager
::
convertDescriptorTypeFlag
(
DescriptorType
type
)
{
vk
::
DescriptorType
DescriptorManager
::
convertDescriptorTypeFlag
(
DescriptorType
type
)
{
switch
(
type
)
switch
(
type
)
{
{
case
vkcv
::
DescriptorType
::
UNIFORM_BUFFER
:
case
DescriptorType
::
UNIFORM_BUFFER
:
return
vk
::
DescriptorType
::
eUniformBuffer
;
return
vk
::
DescriptorType
::
eUniformBuffer
;
case
vkcv
::
DescriptorType
::
SAMPLER
:
case
DescriptorType
::
SAMPLER
:
return
vk
::
DescriptorType
::
eSampler
;
return
vk
::
DescriptorType
::
eSampler
;
case
vkcv
::
DescriptorType
::
IMAGE
:
case
DescriptorType
::
IMAGE
:
return
vk
::
DescriptorType
::
eSampledImage
;
return
vk
::
DescriptorType
::
eSampledImage
;
}
}
}
}
...
@@ -71,17 +71,17 @@ namespace vkcv
...
@@ -71,17 +71,17 @@ namespace vkcv
vk
::
ShaderStageFlagBits
DescriptorManager
::
convertShaderStageFlag
(
ShaderStage
stage
)
{
vk
::
ShaderStageFlagBits
DescriptorManager
::
convertShaderStageFlag
(
ShaderStage
stage
)
{
switch
(
stage
)
switch
(
stage
)
{
{
case
vkcv
::
ShaderStage
::
VERTEX
:
case
ShaderStage
::
VERTEX
:
return
vk
::
ShaderStageFlagBits
::
eVertex
;
return
vk
::
ShaderStageFlagBits
::
eVertex
;
case
vkcv
::
ShaderStage
::
FRAGMENT
:
case
ShaderStage
::
FRAGMENT
:
return
vk
::
ShaderStageFlagBits
::
eFragment
;
return
vk
::
ShaderStageFlagBits
::
eFragment
;
case
vkcv
::
ShaderStage
::
TESS_CONTROL
:
case
ShaderStage
::
TESS_CONTROL
:
return
vk
::
ShaderStageFlagBits
::
eTessellationControl
;
return
vk
::
ShaderStageFlagBits
::
eTessellationControl
;
case
vkcv
::
ShaderStage
::
TESS_EVAL
:
case
ShaderStage
::
TESS_EVAL
:
return
vk
::
ShaderStageFlagBits
::
eTessellationControl
;
return
vk
::
ShaderStageFlagBits
::
eTessellationControl
;
case
vkcv
::
ShaderStage
::
GEOMETRY
:
case
ShaderStage
::
GEOMETRY
:
return
vk
::
ShaderStageFlagBits
::
eGeometry
;
return
vk
::
ShaderStageFlagBits
::
eGeometry
;
case
vkcv
::
ShaderStage
::
COMPUTE
:
case
ShaderStage
::
COMPUTE
:
return
vk
::
ShaderStageFlagBits
::
eCompute
;
return
vk
::
ShaderStageFlagBits
::
eCompute
;
}
}
}
}
...
...
This diff is collapsed.
Click to expand it.
src/vkcv/DescriptorManager.hpp
+
1
−
1
View file @
07b4b3f3
...
@@ -57,6 +57,6 @@ namespace vkcv
...
@@ -57,6 +57,6 @@ namespace vkcv
* @param[in] vkcv flag of the ShaderStage (see ShaderProgram.hpp)
* @param[in] vkcv flag of the ShaderStage (see ShaderProgram.hpp)
* @return vk flag of the ShaderStage
* @return vk flag of the ShaderStage
*/
*/
vk
::
ShaderStageFlagBits
vkcv
::
DescriptorManager
::
convertShaderStageFlag
(
ShaderStage
stage
);
vk
::
ShaderStageFlagBits
DescriptorManager
::
convertShaderStageFlag
(
ShaderStage
stage
);
};
};
}
}
\ No newline at end of file
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