Skip to content

ETW Logging Migration #139

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
justnullname wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

ETW Logging Migration #139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
644a2f9
Migrate logging to high-performance ETW structured logging
justnullname Apr 15, 2026
bc1786f
Migrate logging to high-performance ETW structured logging
justnullname Apr 15, 2026
7586d2e
Migrate logging to high-performance ETW structured logging
justnullname Apr 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion QuickView/CompositionEngine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#include "pch.h"
#include "QuickViewETW.h"
#include "CompositionEngine.h"
#include <dxgi1_6.h>
#include "TileManager.h"
Expand Down Expand Up @@ -537,7 +538,7 @@ bool CompositionEngine::RefreshDisplayColorState(bool forceHdrSimulation) {
m_surfaceFormat = m_isAdvancedColor ? DXGI_FORMAT_R16G16B16A16_FLOAT : DXGI_FORMAT_B8G8R8A8_UNORM;

if (m_isAdvancedColor) {
OutputDebugStringW(L"[HDR] Advanced color active on current monitor. Using FP16 scRGB composition surfaces.\n");
QV_LOG_INFO(L"[HDR] Advanced color active on current monitor. Using FP16 scRGB composition surfaces.\n");
}

return changed;
Expand Down
15 changes: 8 additions & 7 deletions QuickView/ComputeEngine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#include "pch.h"
#include "QuickViewETW.h"
#include "ComputeEngine.h"
#include <d3dcompiler.h>
#include <algorithm>
Expand Down Expand Up @@ -291,7 +292,7 @@ HRESULT ComputeEngine::CompileShaders() {
// 1. Format Convert
HRESULT hr = D3DCompile(HLSL_FormatConvert, strlen(HLSL_FormatConvert), nullptr, nullptr, nullptr, "CSMain", "cs_5_0", D3DCOMPILE_OPTIMIZATION_LEVEL3, 0, &blob, &errorBlob);
if (FAILED(hr)) {
if (errorBlob) OutputDebugStringA((char*)errorBlob->GetBufferPointer());
if (errorBlob) QV_LOG(QV_LOG_LEVEL_ERROR, "ShaderError", TraceLoggingString((char*)errorBlob->GetBufferPointer(), "Error"));
return hr;
}
hr = m_d3dDevice->CreateComputeShader(blob->GetBufferPointer(), blob->GetBufferSize(), nullptr, &m_csFormatConvert);
Expand All @@ -308,7 +309,7 @@ HRESULT ComputeEngine::CompileShaders() {
blob.Reset(); errorBlob.Reset();
hr = D3DCompile(HLSL_ToneMapHdrToSdr, strlen(HLSL_ToneMapHdrToSdr), nullptr, nullptr, nullptr, "CSToneMap", "cs_5_0", D3DCOMPILE_OPTIMIZATION_LEVEL3, 0, &blob, &errorBlob);
if (FAILED(hr)) {
if (errorBlob) OutputDebugStringA((char*)errorBlob->GetBufferPointer());
if (errorBlob) QV_LOG(QV_LOG_LEVEL_ERROR, "ShaderError", TraceLoggingString((char*)errorBlob->GetBufferPointer(), "Error"));
return hr;
}
hr = m_d3dDevice->CreateComputeShader(blob->GetBufferPointer(), blob->GetBufferSize(), nullptr, &m_csToneMapHdrToSdr);
Expand All @@ -318,7 +319,7 @@ HRESULT ComputeEngine::CompileShaders() {
blob.Reset(); errorBlob.Reset();
hr = D3DCompile(HLSL_ToneMapHdrToHdr, strlen(HLSL_ToneMapHdrToHdr), nullptr, nullptr, nullptr, "CSToneMapHDR", "cs_5_0", D3DCOMPILE_OPTIMIZATION_LEVEL3, 0, &blob, &errorBlob);
if (FAILED(hr)) {
if (errorBlob) OutputDebugStringA((char*)errorBlob->GetBufferPointer());
if (errorBlob) QV_LOG(QV_LOG_LEVEL_ERROR, "ShaderError", TraceLoggingString((char*)errorBlob->GetBufferPointer(), "Error"));
return hr;
}
hr = m_d3dDevice->CreateComputeShader(blob->GetBufferPointer(), blob->GetBufferSize(), nullptr, &m_csToneMapHdrToHdr);
Expand All @@ -328,7 +329,7 @@ HRESULT ComputeEngine::CompileShaders() {
blob.Reset(); errorBlob.Reset();
hr = D3DCompile(HLSL_ComposeGainMap, strlen(HLSL_ComposeGainMap), nullptr, nullptr, nullptr, "CSComposeGainMap", "cs_5_0", D3DCOMPILE_OPTIMIZATION_LEVEL3, 0, &blob, &errorBlob);
if (FAILED(hr)) {
if (errorBlob) OutputDebugStringA((char*)errorBlob->GetBufferPointer());
if (errorBlob) QV_LOG(QV_LOG_LEVEL_ERROR, "ShaderError", TraceLoggingString((char*)errorBlob->GetBufferPointer(), "Error"));
return hr;
}
hr = m_d3dDevice->CreateComputeShader(blob->GetBufferPointer(), blob->GetBufferSize(), nullptr, &m_csComposeGainMap);
Expand Down Expand Up @@ -653,19 +654,19 @@ HRESULT ComputeEngine::ComposeGainMap(
ID3D11Texture2D** outTexture)
{
if (!m_valid || !sdrPixels || !gainPixels || !outTexture) {
OutputDebugStringW(L"[ComputeEngine] ComposeGainMap: Invalid arguments or engine state.\n");
QV_LOG_INFO(L"[ComputeEngine] ComposeGainMap: Invalid arguments or engine state.\n");
return E_INVALIDARG;
}
if (sdrW <= 0 || sdrH <= 0 || gainW <= 0 || gainH <= 0) {
OutputDebugStringW(L"[ComputeEngine] ComposeGainMap: Invalid dimensions.\n");
QV_LOG_INFO(L"[ComputeEngine] ComposeGainMap: Invalid dimensions.\n");
return E_INVALIDARG;
}

// [Diagnostic] Log composition start
wchar_t logBuf[256];
swprintf_s(logBuf, L"[ComputeEngine] Compose: SDR %dx%d, Gain %dx%d, Headroom %.2f, MaxGain %.2f\n",
sdrW, sdrH, gainW, gainH, payload.targetHeadroom, payload.gainMapMax[0]);
OutputDebugStringW(logBuf);
QV_LOG_INFO(logBuf);

// 1. Upload SDR base layer (Can be BGRA8 or R32G32B32A32_FLOAT)
D3D11_TEXTURE2D_DESC sdrDesc = {};
Expand Down
363 changes: 194 additions & 169 deletions QuickView/HeavyLanePool.cpp
View file
Open in desktop

Large diffs are not rendered by default.

Loading
Loading