use ComPtr for resources instead of standard smart pointers.

This commit is contained in:
hecomi
2016-11-12 02:44:20 +09:00
parent e4e4917bcb
commit 63d8f6936d
7 changed files with 33 additions and 48 deletions
@@ -69,8 +69,6 @@ public class MultipleMonitorCreator : MonoBehaviour
{ {
ResetRemoveTimer(); ResetRemoveTimer();
Debug.Log(uDesktopDuplication.Manager.monitorCount);
// Create monitors // Create monitors
for (int i = 0; i < uDesktopDuplication.Manager.monitorCount; ++i) { for (int i = 0; i < uDesktopDuplication.Manager.monitorCount; ++i) {
// Create monitor obeject // Create monitor obeject
@@ -13,18 +13,6 @@ struct ID3D11Device;
ID3D11Device* GetDevice(); ID3D11Device* GetDevice();
// Utility
template <class T>
auto MakeUniqueWithReleaser(T* ptr)
{
const auto deleter = [](T* ptr)
{
if (ptr != nullptr) ptr->Release();
};
return std::unique_ptr<T, decltype(deleter)>(ptr, deleter);
}
// Manager getter // Manager getter
class MonitorManager; class MonitorManager;
const std::unique_ptr<MonitorManager>& GetMonitorManager(); const std::unique_ptr<MonitorManager>& GetMonitorManager();
@@ -1,10 +1,13 @@
#include <d3d11.h> #include <d3d11.h>
#include <wrl/client.h>
#include "Common.h" #include "Common.h"
#include "Debug.h" #include "Debug.h"
#include "MonitorManager.h" #include "MonitorManager.h"
#include "Monitor.h" #include "Monitor.h"
#include "Cursor.h" #include "Cursor.h"
using namespace Microsoft::WRL;
Cursor::Cursor(Monitor* monitor) Cursor::Cursor(Monitor* monitor)
: monitor_(monitor) : monitor_(monitor)
@@ -149,9 +152,8 @@ void Cursor::UpdateTexture()
desc.CPUAccessFlags = D3D11_CPU_ACCESS_READ; desc.CPUAccessFlags = D3D11_CPU_ACCESS_READ;
desc.MiscFlags = 0; desc.MiscFlags = 0;
ID3D11Texture2D* texture = nullptr; ComPtr<ID3D11Texture2D> texture;
hr = GetDevice()->CreateTexture2D(&desc, nullptr, &texture); hr = GetDevice()->CreateTexture2D(&desc, nullptr, &texture);
const auto textureReleaser = MakeUniqueWithReleaser(texture);
if (FAILED(hr)) if (FAILED(hr))
{ {
Debug::Error("Cursor::UpdateTexture() => GetDevice()->CreateTexture2D() failed."); Debug::Error("Cursor::UpdateTexture() => GetDevice()->CreateTexture2D() failed.");
@@ -172,14 +174,14 @@ void Cursor::UpdateTexture()
return; return;
} }
ID3D11DeviceContext* context; {
GetDevice()->GetImmediateContext(&context); ComPtr<ID3D11DeviceContext> context;
context->CopySubresourceRegion(texture, 0, 0, 0, 0, monitor_->GetUnityTexture(), 0, &box); GetDevice()->GetImmediateContext(&context);
context->Release(); context->CopySubresourceRegion(texture.Get(), 0, 0, 0, 0, monitor_->GetUnityTexture(), 0, &box);
}
IDXGISurface* surface = nullptr; ComPtr<IDXGISurface> surface;
hr = texture->QueryInterface(__uuidof(IDXGISurface), (void**)&surface); hr = texture.As<IDXGISurface>(&surface);
const auto surfaceReleaser = MakeUniqueWithReleaser(surface);
if (FAILED(hr)) if (FAILED(hr))
{ {
Debug::Error("Cursor::UpdateTexture() => texture->QueryInterface() failed."); Debug::Error("Cursor::UpdateTexture() => texture->QueryInterface() failed.");
@@ -286,10 +288,9 @@ void Cursor::GetTexture(ID3D11Texture2D* texture)
return; return;
} }
ID3D11DeviceContext* context; ComPtr<ID3D11DeviceContext> context;
GetDevice()->GetImmediateContext(&context); GetDevice()->GetImmediateContext(&context);
context->UpdateSubresource(texture, 0, nullptr, bgra32Buffer_.get(), GetWidth() * 4, 0); context->UpdateSubresource(texture, 0, nullptr, bgra32Buffer_.get(), GetWidth() * 4, 0);
context->Release();
} }
@@ -6,6 +6,8 @@
#include "MonitorManager.h" #include "MonitorManager.h"
#include "Monitor.h" #include "Monitor.h"
using namespace Microsoft::WRL;
Monitor::Monitor(int id) Monitor::Monitor(int id)
: id_(id) : id_(id)
@@ -28,17 +30,14 @@ void Monitor::Initialize(IDXGIOutput* output)
GetDpiForMonitor(outputDesc_.Monitor, MDT_RAW_DPI, &dpiX_, &dpiY_); GetDpiForMonitor(outputDesc_.Monitor, MDT_RAW_DPI, &dpiX_, &dpiY_);
auto output1 = reinterpret_cast<IDXGIOutput1*>(output); auto output1 = reinterpret_cast<IDXGIOutput1*>(output);
IDXGIOutputDuplication* deskDupl; const auto hr = output1->DuplicateOutput(GetDevice(), &deskDupl_);
const auto hr = output1->DuplicateOutput(GetDevice(), &deskDupl);
// TODO: error check // TODO: error check
switch (hr) switch (hr)
{ {
case S_OK: case S_OK:
state_ = State::Available; state_ = State::Available;
deskDupl_ = std::shared_ptr<IDXGIOutputDuplication>( Debug::Log("Monitor::Initialize() => OK.");
deskDupl,
[](IDXGIOutputDuplication* ptr) { if (ptr != nullptr) ptr->Release(); });
break; break;
case E_INVALIDARG: case E_INVALIDARG:
state_ = State::InvalidArg; state_ = State::InvalidArg;
@@ -73,12 +72,11 @@ void Monitor::Render(UINT timeout)
{ {
if (!deskDupl_) return; if (!deskDupl_) return;
IDXGIResource* resource = nullptr; ComPtr<IDXGIResource> resource;
DXGI_OUTDUPL_FRAME_INFO frameInfo; DXGI_OUTDUPL_FRAME_INFO frameInfo;
HRESULT hr; HRESULT hr;
hr = deskDupl_->AcquireNextFrame(timeout, &frameInfo, &resource); hr = deskDupl_->AcquireNextFrame(timeout, &frameInfo, &resource);
const auto resourceReleaser = MakeUniqueWithReleaser(resource);
if (FAILED(hr)) if (FAILED(hr))
{ {
switch (hr) switch (hr)
@@ -107,13 +105,12 @@ void Monitor::Render(UINT timeout)
if (unityTexture_) if (unityTexture_)
{ {
ID3D11Texture2D* texture; ComPtr<ID3D11Texture2D> texture;
resource->QueryInterface(__uuidof(ID3D11Texture2D), reinterpret_cast<void**>(&texture)); resource.As<ID3D11Texture2D>(&texture);
ID3D11DeviceContext* context; ComPtr<ID3D11DeviceContext> context;
GetDevice()->GetImmediateContext(&context); GetDevice()->GetImmediateContext(&context);
context->CopyResource(unityTexture_, texture); context->CopyResource(unityTexture_, texture.Get());
context->Release();
} }
cursor_->UpdateBuffer(frameInfo); cursor_->UpdateBuffer(frameInfo);
@@ -151,7 +148,7 @@ ID3D11Texture2D* Monitor::GetUnityTexture() const
} }
const std::shared_ptr<IDXGIOutputDuplication>& Monitor::GetDeskDupl() const ComPtr<IDXGIOutputDuplication>& Monitor::GetDeskDupl()
{ {
return deskDupl_; return deskDupl_;
} }
@@ -2,6 +2,7 @@
#include <d3d11.h> #include <d3d11.h>
#include <dxgi1_2.h> #include <dxgi1_2.h>
#include <wrl/client.h>
#include <memory> #include <memory>
class Cursor; class Cursor;
@@ -45,7 +46,7 @@ public:
int GetRotation() const; int GetRotation() const;
int GetDpiX() const; int GetDpiX() const;
int GetDpiY() const; int GetDpiY() const;
const std::shared_ptr<IDXGIOutputDuplication>& GetDeskDupl(); const Microsoft::WRL::ComPtr<IDXGIOutputDuplication>& GetDeskDupl();
const std::unique_ptr<Cursor>& GetCursor(); const std::unique_ptr<Cursor>& GetCursor();
private: private:
@@ -53,7 +54,7 @@ private:
UINT dpiX_ = -1, dpiY_ = -1; UINT dpiX_ = -1, dpiY_ = -1;
State state_ = State::NotSet; State state_ = State::NotSet;
std::unique_ptr<Cursor> cursor_; std::unique_ptr<Cursor> cursor_;
std::shared_ptr<IDXGIOutputDuplication> deskDupl_; Microsoft::WRL::ComPtr<IDXGIOutputDuplication> deskDupl_;
ID3D11Texture2D* unityTexture_ = nullptr; ID3D11Texture2D* unityTexture_ = nullptr;
DXGI_OUTPUT_DESC outputDesc_; DXGI_OUTPUT_DESC outputDesc_;
MONITORINFOEX monitorInfo_; MONITORINFOEX monitorInfo_;
@@ -1,5 +1,6 @@
#include <d3d11.h> #include <d3d11.h>
#include <dxgi1_2.h> #include <dxgi1_2.h>
#include <wrl/client.h>
#include <vector> #include <vector>
#include <string> #include <string>
#include <algorithm> #include <algorithm>
@@ -12,6 +13,8 @@
#include "Cursor.h" #include "Cursor.h"
#include "MonitorManager.h" #include "MonitorManager.h"
using namespace Microsoft::WRL;
MonitorManager::MonitorManager() MonitorManager::MonitorManager()
{ {
@@ -30,23 +33,20 @@ void MonitorManager::Initialize()
Finalize(); Finalize();
// Get factory // Get factory
IDXGIFactory1* factory; ComPtr<IDXGIFactory1> factory;
CreateDXGIFactory1(__uuidof(IDXGIFactory1), reinterpret_cast<void**>(&factory)); CreateDXGIFactory1(IID_PPV_ARGS(&factory));
const auto factoryReleaser = MakeUniqueWithReleaser(factory);
// Check all display adapters // Check all display adapters
int id = 0; int id = 0;
IDXGIAdapter1* adapter; ComPtr<IDXGIAdapter1> adapter;
for (int i = 0; (factory->EnumAdapters1(i, &adapter) != DXGI_ERROR_NOT_FOUND); ++i) for (int i = 0; (factory->EnumAdapters1(i, &adapter) != DXGI_ERROR_NOT_FOUND); ++i)
{ {
const auto adapterReleaser = MakeUniqueWithReleaser(adapter);
// Search the main monitor from all outputs // Search the main monitor from all outputs
IDXGIOutput* output; ComPtr<IDXGIOutput> output;
for (int j = 0; (adapter->EnumOutputs(j, &output) != DXGI_ERROR_NOT_FOUND); ++j) for (int j = 0; (adapter->EnumOutputs(j, &output) != DXGI_ERROR_NOT_FOUND); ++j)
{ {
const auto outputReleaser = MakeUniqueWithReleaser(output);
auto monitor = std::make_shared<Monitor>(id++); auto monitor = std::make_shared<Monitor>(id++);
monitor->Initialize(output); monitor->Initialize(output.Get());
monitors_.push_back(monitor); monitors_.push_back(monitor);
} }
} }