niansa-misc/dxvk
1
0
Fork 0
mirror of https://github.com/doitsujin/dxvk.git synced 2025-03-06 20:58:37 +01:00
Code Issues Projects Releases Packages Wiki Activity

[d3d11] Make user defined annotation more robust

Browse source
This commit is contained in:
Philip Rebohle 2025-03-05 16:29:28 +01:00
parent d8eb4d0d66
commit 91b48dd31d
2 changed files with 22 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
src/d3d11/d3d11_annotation.cpp
View file

@ -37,7 +37,7 @@ namespace dxvk {
D3D11UserDefinedAnnotation<ContextType>::D3D11UserDefinedAnnotation( D3D11UserDefinedAnnotation<ContextType>::D3D11UserDefinedAnnotation(
ContextType* container, ContextType* container,
const Rc<DxvkDevice>& dxvkDevice) const Rc<DxvkDevice>& dxvkDevice)
: m_container(container), m_eventDepth(0), : m_container(container),
m_annotationsEnabled(dxvkDevice->isDebugEnabled()) { m_annotationsEnabled(dxvkDevice->isDebugEnabled()) {
if (!IsDeferred && m_annotationsEnabled) if (!IsDeferred && m_annotationsEnabled)
RegisterUserDefinedAnnotation<true>(this); RegisterUserDefinedAnnotation<true>(this);
@ -75,19 +75,16 @@ namespace dxvk {
INT STDMETHODCALLTYPE D3D11UserDefinedAnnotation<ContextType>::BeginEvent( INT STDMETHODCALLTYPE D3D11UserDefinedAnnotation<ContextType>::BeginEvent(
D3DCOLOR Color, D3DCOLOR Color,
LPCWSTR Name) { LPCWSTR Name) {
if (!m_annotationsEnabled) if (!m_annotationsEnabled || !Name)
return -1; return -1;
D3D10DeviceLock lock = m_container->LockContext(); D3D10DeviceLock lock = m_container->LockContext();
m_container->EmitCs([color = Color, labelName = dxvk::str::fromws(Name)](DxvkContext *ctx) { m_container->EmitCs([
VkDebugUtilsLabelEXT label; cColor = Color,
label.sType = VK_STRUCTURE_TYPE_DEBUG_UTILS_LABEL_EXT; cLabel = dxvk::str::fromws(Name)
label.pNext = nullptr; ] (DxvkContext* ctx) {
label.pLabelName = labelName.c_str(); ctx->beginDebugLabel(vk::makeLabel(cColor, cLabel.c_str()));
DecodeD3DCOLOR(color, label.color);
ctx->beginDebugLabel(label);
}); });
return m_eventDepth++; return m_eventDepth++;
@ -101,11 +98,14 @@ namespace dxvk {
D3D10DeviceLock lock = m_container->LockContext(); D3D10DeviceLock lock = m_container->LockContext();
m_container->EmitCs([](DxvkContext *ctx) { if (!m_eventDepth)
return 0;
m_container->EmitCs([] (DxvkContext* ctx) {
ctx->endDebugLabel(); ctx->endDebugLabel();
}); });
return m_eventDepth--; return --m_eventDepth;
} }
@ -113,19 +113,16 @@ namespace dxvk {
void STDMETHODCALLTYPE D3D11UserDefinedAnnotation<ContextType>::SetMarker( void STDMETHODCALLTYPE D3D11UserDefinedAnnotation<ContextType>::SetMarker(
D3DCOLOR Color, D3DCOLOR Color,
LPCWSTR Name) { LPCWSTR Name) {
if (!m_annotationsEnabled) if (!m_annotationsEnabled || !Name)
return; return;
D3D10DeviceLock lock = m_container->LockContext(); D3D10DeviceLock lock = m_container->LockContext();
m_container->EmitCs([color = Color, labelName = dxvk::str::fromws(Name)](DxvkContext *ctx) { m_container->EmitCs([
VkDebugUtilsLabelEXT label; cColor = Color,
label.sType = VK_STRUCTURE_TYPE_DEBUG_UTILS_LABEL_EXT; cLabel = dxvk::str::fromws(Name)
label.pNext = nullptr; ] (DxvkContext* ctx) {
label.pLabelName = labelName.c_str(); ctx->insertDebugLabel(vk::makeLabel(cColor, cLabel.c_str()));
DecodeD3DCOLOR(color, label.color);
ctx->insertDebugLabel(label);
}); });
} }

7
src/d3d11/d3d11_annotation.h
View file

@ -48,9 +48,10 @@ namespace dxvk {
private: private:
ContextType* m_container; ContextType* m_container = nullptr;
int32_t m_eventDepth; int32_t m_eventDepth = 0u;
bool m_annotationsEnabled; bool m_annotationsEnabled = false;
}; };
} }