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
68b587bf
Commit
68b587bf
authored
3 years ago
by
Alex Laptop
Browse files
Options
Downloads
Patches
Plain Diff
[
#114
] Add separate macro for vulkan debug labels, so labels can be used in Release mode
parent
3dd21e3a
No related branches found
No related tags found
1 merge request
!98
Resolve "Voxelization auf AMD iGPU broken"
Pipeline
#27279
passed
3 years ago
Stage: build
Stage: deploy
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CMakeLists.txt
+3
-0
3 additions, 0 deletions
CMakeLists.txt
src/vkcv/Core.cpp
+5
-5
5 additions, 5 deletions
src/vkcv/Core.cpp
with
8 additions
and
5 deletions
CMakeLists.txt
+
3
−
0
View file @
68b587bf
...
...
@@ -45,6 +45,9 @@ endif()
# configure everything to use the required dependencies
include
(
${
vkcv_config
}
/Libraries.cmake
)
# set macro to enable vulkan debug labels
list
(
APPEND vkcv_definitions VULKAN_DEBUG_LABELS
)
# set the compile definitions aka preprocessor variables
add_compile_definitions
(
${
vkcv_definitions
}
)
...
...
This diff is collapsed.
Click to expand it.
src/vkcv/Core.cpp
+
5
−
5
View file @
68b587bf
...
...
@@ -443,7 +443,7 @@ namespace vkcv
void
Core
::
recordBeginDebugLabel
(
const
CommandStreamHandle
&
cmdStream
,
const
std
::
string
&
label
,
const
std
::
array
<
float
,
4
>&
color
)
{
#if
n
def
NDEBUG
#ifdef
VULKAN_DEBUG_LABELS
static
PFN_vkCmdBeginDebugUtilsLabelEXT
beginDebugLabel
=
reinterpret_cast
<
PFN_vkCmdBeginDebugUtilsLabelEXT
>
(
m_Context
.
getDevice
().
getProcAddr
(
"vkCmdBeginDebugUtilsLabelEXT"
)
);
...
...
@@ -462,11 +462,11 @@ namespace vkcv
};
recordCommandsToStream
(
cmdStream
,
submitFunction
,
nullptr
);
#endif
#endif
}
void
Core
::
recordEndDebugLabel
(
const
CommandStreamHandle
&
cmdStream
)
{
#if
n
def
NDEBUG
#ifdef
VULKAN_DEBUG_LABELS
static
PFN_vkCmdEndDebugUtilsLabelEXT
endDebugLabel
=
reinterpret_cast
<
PFN_vkCmdEndDebugUtilsLabelEXT
>
(
m_Context
.
getDevice
().
getProcAddr
(
"vkCmdEndDebugUtilsLabelEXT"
)
);
...
...
@@ -480,7 +480,7 @@ namespace vkcv
};
recordCommandsToStream
(
cmdStream
,
submitFunction
,
nullptr
);
#endif
#endif
}
void
Core
::
recordComputeIndirectDispatchToCmdStream
(
...
...
@@ -864,7 +864,7 @@ namespace vkcv
static
void
setDebugObjectLabel
(
const
vk
::
Device
&
device
,
const
vk
::
ObjectType
&
type
,
uint64_t
handle
,
const
std
::
string
&
label
)
{
#ifndef
NDEBUG
#ifndef
VULKAN_DEBUG_LABELS
static
PFN_vkSetDebugUtilsObjectNameEXT
setDebugLabel
=
reinterpret_cast
<
PFN_vkSetDebugUtilsObjectNameEXT
>
(
device
.
getProcAddr
(
"vkSetDebugUtilsObjectNameEXT"
)
);
...
...
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