mirrors
/
dxvk
mirror of https://github.com/doitsujin/dxvk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[general] Minor COM pointer improvements

This commit is contained in:
Philip Rebohle 2018-01-29 16:31:25 +01:00
parent 173e46e2bd
commit ca53eaf878
No known key found for this signature in database
GPG Key ID: C8CC613427A31C99
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/d3d11/d3d11_context.cpp
View File

@ -1728,7 +1728,7 @@ namespace dxvk {
m_state.om.sampleMask = SampleMask; m_state.om.sampleMask = SampleMask;
if (blendState == nullptr) if (blendState == nullptr)
blendState = m_defaultBlendState.ptr(); blendState = m_defaultBlendState;
EmitCs([ EmitCs([
cBlendState = std::move(blendState), cBlendState = std::move(blendState),
@ -1769,7 +1769,7 @@ namespace dxvk {
m_state.om.dsState = depthStencilState; m_state.om.dsState = depthStencilState;
if (depthStencilState == nullptr) if (depthStencilState == nullptr)
depthStencilState = m_defaultDepthStencilState.ptr(); depthStencilState = m_defaultDepthStencilState;
EmitCs([cDepthStencilState = std::move(depthStencilState)] EmitCs([cDepthStencilState = std::move(depthStencilState)]
(DxvkContext* ctx) { (DxvkContext* ctx) {
@ -1848,7 +1848,7 @@ namespace dxvk {
m_state.rs.state = rasterizerState; m_state.rs.state = rasterizerState;
if (rasterizerState == nullptr) if (rasterizerState == nullptr)
rasterizerState = m_defaultRasterizerState.ptr(); rasterizerState = m_defaultRasterizerState;
EmitCs([cRasterizerState = std::move(rasterizerState)] EmitCs([cRasterizerState = std::move(rasterizerState)]
(DxvkContext* ctx) { (DxvkContext* ctx) {

7
src/util/com/com_pointer.h
View File

@ -32,6 +32,13 @@ namespace dxvk {
other.m_ptr = nullptr; other.m_ptr = nullptr;
} }
Com& operator = (T* object) {
this->decRef();
m_ptr = object;
this->incRef();
return *this;
}
Com& operator = (const Com& other) { Com& operator = (const Com& other) {
other.incRef(); other.incRef();
this->decRef(); this->decRef();