backup/OpenDX
1
0
Fork 0
mirror of https://github.com/EduApps-CDG/OpenDX synced 2024-12-30 09:45:37 +01:00
Code Issues Projects Releases Activity

[dxvk] Refactored blend constants

Browse Source 
This will make things a little less painful when capturing
blend constants in a lambda function, as required for CSMT.
This commit is contained in:
Philip Rebohle 2018-01-20 15:41:06 +01:00
parent 62a43cbdbe
commit 2dd24a14d2
No known key found for this signature in database
GPG Key ID: C8CC613427A31C99
5 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/d3d11/d3d11_context.cpp
View File

@ -39,7 +39,9 @@ namespace dxvk {
m_defaultRasterizerState = static_cast<D3D11RasterizerState*>(defaultRasterizerState.ptr()); m_defaultRasterizerState = static_cast<D3D11RasterizerState*>(defaultRasterizerState.ptr());
m_defaultRasterizerState->BindToContext(m_context); m_defaultRasterizerState->BindToContext(m_context);
m_context->setBlendConstants(m_state.om.blendFactor); m_context->setBlendConstants(DxvkBlendConstants {
m_state.om.blendFactor[0], m_state.om.blendFactor[1],
m_state.om.blendFactor[2], m_state.om.blendFactor[3] });
m_context->setStencilReference(m_state.om.stencilRef); m_context->setStencilReference(m_state.om.stencilRef);
// Create a default sampler that we're going to bind // Create a default sampler that we're going to bind
@ -1481,9 +1483,11 @@ namespace dxvk {
blendState->BindToContext(m_context, SampleMask); blendState->BindToContext(m_context, SampleMask);
} }
if ((BlendFactor != nullptr) && (!std::memcmp(m_state.om.blendFactor, BlendFactor, 4 * sizeof(FLOAT)))) { if (BlendFactor != nullptr) {
std::memcpy(m_state.om.blendFactor, BlendFactor, 4 * sizeof(FLOAT)); std::memcpy(m_state.om.blendFactor, BlendFactor, 4 * sizeof(FLOAT));
m_context->setBlendConstants(BlendFactor);
m_context->setBlendConstants(DxvkBlendConstants {
BlendFactor[0], BlendFactor[1], BlendFactor[2], BlendFactor[3] });
} }
} }

11
src/dxvk/dxvk_constant_state.h
View File

@ -8,6 +8,17 @@
namespace dxvk { namespace dxvk {
/**
* \brief Blend constants
*
* Stores a blend factor
* as an RGBA color value.
*/
struct DxvkBlendConstants {
float r, g, b, a;
};
/** /**
* \brief Input assembly state * \brief Input assembly state
* *

6
src/dxvk/dxvk_context.cpp
View File

@ -1002,9 +1002,9 @@ namespace dxvk {
void DxvkContext::setBlendConstants( void DxvkContext::setBlendConstants(
const float blendConstants[4]) { const DxvkBlendConstants& blendConstants) {
for (uint32_t i = 0; i < 4; i++) for (uint32_t i = 0; i < 4; i++)
m_state.om.blendConstants[i] = blendConstants[i]; m_state.om.blendConstants = blendConstants;
this->updateBlendConstants(); this->updateBlendConstants();
} }
@ -1400,7 +1400,7 @@ namespace dxvk {
void DxvkContext::updateBlendConstants() { void DxvkContext::updateBlendConstants() {
m_cmd->cmdSetBlendConstants(m_state.om.blendConstants); m_cmd->cmdSetBlendConstants(&m_state.om.blendConstants.r);
} }

2
src/dxvk/dxvk_context.h
View File

@ -438,7 +438,7 @@ namespace dxvk {
* \param [in] blendConstants Blend constants * \param [in] blendConstants Blend constants
*/ */
void setBlendConstants( void setBlendConstants(
const float blendConstants[4]); const DxvkBlendConstants& blendConstants);
/** /**
* \brief Sets stencil reference * \brief Sets stencil reference

4
src/dxvk/dxvk_context_state.h
View File

@ -57,8 +57,8 @@ namespace dxvk {
struct DxvkOutputMergerState { struct DxvkOutputMergerState {
Rc<DxvkFramebuffer> framebuffer; Rc<DxvkFramebuffer> framebuffer;
float blendConstants[4]; DxvkBlendConstants blendConstants;
uint32_t stencilReference; uint32_t stencilReference;
}; };