Skip to content

Commit

Permalink
Properly release additional DX interfaces
Browse files Browse the repository at this point in the history
  • Loading branch information
@actions-user @sergcpp
actions-user authored and sergcpp committed Jul 11, 2024
1 parent e831b95 commit 1b591ae
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 22 deletions.
48 changes: 32 additions & 16 deletions internal/Dx/ContextDX.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@ void DebugReportCallback(D3D12_MESSAGE_CATEGORY Category, D3D12_MESSAGE_SEVERITY
if (ID == D3D12_MESSAGE_ID_CORRUPTED_PARAMETER2) {
return;
}
if (ID == D3D12_MESSAGE_ID_LIVE_DEVICE && strstr(pDescription, "Refcount: 2")) {
return;
}
auto *ctx = reinterpret_cast<const Context *>(pContext);
ctx->log()->Error("%s\n", pDescription);
}
Expand All @@ -54,15 +57,6 @@ void Ray::Dx::Context::Destroy() {
(p) = 0; \
}

if (debug_callback_cookie_) {
ID3D12InfoQueue1 *info_queue;
HRESULT hr = device_->QueryInterface(IID_PPV_ARGS(&info_queue));
if (SUCCEEDED(hr)) {
info_queue->UnregisterMessageCallback(debug_callback_cookie_);
debug_callback_cookie_ = {};
}
}

for (int i = 0; i < MaxFramesInFlight; ++i) {
SAFE_RELEASE(command_allocators_[i]);
SAFE_RELEASE(in_flight_fences_[i]);
Expand All @@ -88,10 +82,23 @@ void Ray::Dx::Context::Destroy() {
SAFE_RELEASE(temp_command_allocator_);
SAFE_RELEASE(indirect_dispatch_cmd_signature_);

SAFE_RELEASE(device5_);

if (validation_level_) {
ID3D12DebugDevice *debug_device = nullptr;
if (device_ && SUCCEEDED(device_->QueryInterface(IID_PPV_ARGS(&debug_device)))) {
debug_device->ReportLiveDeviceObjects(D3D12_RLDO_DETAIL | D3D12_RLDO_IGNORE_INTERNAL);
debug_device->Release();
}
}

if (debug_callback_cookie_) {
ID3D12InfoQueue1 *info_queue = {};
HRESULT hr = device_->QueryInterface(IID_PPV_ARGS(&info_queue));
if (SUCCEEDED(hr)) {
info_queue->UnregisterMessageCallback(debug_callback_cookie_);
debug_callback_cookie_ = {};
info_queue->Release();
}
}

Expand Down Expand Up @@ -200,7 +207,7 @@ bool Ray::Dx::Context::Init(ILog *log, const char *preferred_device, const int v
command_list_->Close();

if (validation_level) {
ID3D12InfoQueue1 *info_queue;
ID3D12InfoQueue1 *info_queue = {};
hr = device_->QueryInterface(IID_PPV_ARGS(&info_queue));
if (SUCCEEDED(hr)) {
hr = info_queue->RegisterMessageCallback(DebugReportCallback,
Expand All @@ -209,6 +216,7 @@ bool Ray::Dx::Context::Init(ILog *log, const char *preferred_device, const int v
if (FAILED(hr)) {
log->Error("Failed to register message callback!");
}
info_queue->Release();
}
}

Expand All @@ -219,6 +227,8 @@ bool Ray::Dx::Context::Init(ILog *log, const char *preferred_device, const int v
}
timestamp_period_us_ = 1000000.0 / double(timestamp_frequency);

// Destroy();

DXGI_ADAPTER_DESC1 desc;
best_adapter->GetDesc1(&desc);

Expand Down Expand Up @@ -250,26 +260,30 @@ bool Ray::Dx::Context::Init(ILog *log, const char *preferred_device, const int v
}
max_combined_image_samplers_ = std::min(max_sampled_images_, max_samplers_);

hr = device_->QueryInterface(IID_PPV_ARGS(&device1_));
ID3D12Device1 *device1 = {};
hr = device_->QueryInterface(IID_PPV_ARGS(&device1));
if (SUCCEEDED(hr)) {
D3D12_FEATURE_DATA_D3D12_OPTIONS1 options1 = {};
hr = device1_->CheckFeatureSupport(D3D12_FEATURE_D3D12_OPTIONS1, &options1, sizeof(options1));
hr = device1->CheckFeatureSupport(D3D12_FEATURE_D3D12_OPTIONS1, &options1, sizeof(options1));
if (SUCCEEDED(hr)) {
if (options1.Int64ShaderOps == TRUE) {
int64_supported_ = true;
}
}
device1->Release();
}

hr = device_->QueryInterface(IID_PPV_ARGS(&device4_));
ID3D12Device4 *device4 = {};
hr = device_->QueryInterface(IID_PPV_ARGS(&device4));
if (SUCCEEDED(hr)) {
D3D12_FEATURE_DATA_D3D12_OPTIONS4 options4 = {};
hr = device4_->CheckFeatureSupport(D3D12_FEATURE_D3D12_OPTIONS4, &options4, sizeof(options4));
hr = device4->CheckFeatureSupport(D3D12_FEATURE_D3D12_OPTIONS4, &options4, sizeof(options4));
if (SUCCEEDED(hr)) {
if (options4.Native16BitShaderOpsSupported == TRUE) {
fp16_supported_ = true;
}
}
device4->Release();
}

hr = device_->QueryInterface(IID_PPV_ARGS(&device5_));
Expand All @@ -283,15 +297,17 @@ bool Ray::Dx::Context::Init(ILog *log, const char *preferred_device, const int v
}
}

hr = device_->QueryInterface(IID_PPV_ARGS(&device9_));
ID3D12Device9 *device9 = {};
hr = device_->QueryInterface(IID_PPV_ARGS(&device9));
if (SUCCEEDED(hr)) {
D3D12_FEATURE_DATA_D3D12_OPTIONS9 feature_support = {};
hr = device9_->CheckFeatureSupport(D3D12_FEATURE_D3D12_OPTIONS9, &feature_support, sizeof(feature_support));
hr = device9->CheckFeatureSupport(D3D12_FEATURE_D3D12_OPTIONS9, &feature_support, sizeof(feature_support));
if (SUCCEEDED(hr)) {
if (feature_support.AtomicInt64OnTypedResourceSupported == TRUE) {
int64_atomics_supported_ = true;
}
}
device9->Release();
}

subgroup_supported_ = true;
Expand Down
7 changes: 1 addition & 6 deletions internal/Dx/ContextDX.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,7 @@
#define COUNT_OF(x) ((sizeof(x) / sizeof(0 [x])) / ((size_t)(!(sizeof(x) % sizeof(0 [x])))))

struct ID3D12Device;
struct ID3D12Device1;
struct ID3D12Device4;
struct ID3D12Device5;
struct ID3D12Device9;
struct ID3D12CommandQueue;
struct ID3D12CommandAllocator;
struct ID3D12GraphicsCommandList;
Expand All @@ -21,6 +18,7 @@ struct ID3D12DescriptorHeap;
struct ID3D12Fence;
struct ID3D12QueryHeap;
struct ID3D12CommandSignature;
struct ID3D12InfoQueue1;
struct IUnknown;

typedef void *HANDLE;
Expand All @@ -45,10 +43,7 @@ class Context {
unsigned long debug_callback_cookie_ = {};
int validation_level_ = 0;
ID3D12Device *device_ = {};
ID3D12Device1 *device1_ = {};
ID3D12Device4 *device4_ = {};
ID3D12Device5 *device5_ = {};
ID3D12Device9 *device9_ = {};
std::string device_name_;

bool raytracing_supported_ = false, ray_query_supported_ = false;
Expand Down

0 comments on commit 1b591ae

Please sign in to comment.