diff options
| author | Egor Yusov <egor.yusov@gmail.com> | 2018-12-03 01:23:03 +0000 |
|---|---|---|
| committer | Egor Yusov <egor.yusov@gmail.com> | 2018-12-03 01:23:03 +0000 |
| commit | a88117b4f379696c315e56d57925589b7c307bc1 (patch) | |
| tree | 7c69946d273772fa7a9a61cb84a022ff60373844 /RenderScript/src | |
| parent | Updating file missed in last comit (diff) | |
| download | DiligentTools-a88117b4f379696c315e56d57925589b7c307bc1.tar.gz DiligentTools-a88117b4f379696c315e56d57925589b7c307bc1.zip | |
Replaced COMMIT_SHADER_RESOURCES_FLAGS with RESOURCE_STATE_TRANSITION_MODE
Diffstat (limited to 'RenderScript/src')
| -rw-r--r-- | RenderScript/src/DeviceContextFuncBindings.cpp | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/RenderScript/src/DeviceContextFuncBindings.cpp b/RenderScript/src/DeviceContextFuncBindings.cpp index f006438..6f265b5 100644 --- a/RenderScript/src/DeviceContextFuncBindings.cpp +++ b/RenderScript/src/DeviceContextFuncBindings.cpp @@ -46,10 +46,6 @@ namespace Diligent m_ShaderResBindingMetatableName( pSRBParser->GetMetatableName() ), m_PSOMetatableName(pPSOParser->GetMetatableName()) { - DEFINE_ENUM_ELEMENT_MAPPING( m_CommitShaderResFlagsEnumMapping, COMMIT_SHADER_RESOURCES_FLAG_NONE ); - DEFINE_ENUM_ELEMENT_MAPPING( m_CommitShaderResFlagsEnumMapping, COMMIT_SHADER_RESOURCES_FLAG_TRANSITION_RESOURCES ); - DEFINE_ENUM_ELEMENT_MAPPING( m_CommitShaderResFlagsEnumMapping, COMMIT_SHADER_RESOURCES_FLAG_VERIFY_STATES ); - DEFINE_ENUM_ELEMENT_MAPPING( m_SetRenderTargetsFlagsEnumMapping, SET_RENDER_TARGETS_FLAG_NONE ); DEFINE_ENUM_ELEMENT_MAPPING( m_SetRenderTargetsFlagsEnumMapping, SET_RENDER_TARGETS_FLAG_TRANSITION_COLOR ); DEFINE_ENUM_ELEMENT_MAPPING( m_SetRenderTargetsFlagsEnumMapping, SET_RENDER_TARGETS_FLAG_TRANSITION_DEPTH ); @@ -137,11 +133,9 @@ namespace Diligent } RESOURCE_STATE_TRANSITION_MODE StateTransitionMode = RESOURCE_STATE_TRANSITION_MODE_NONE; - if( CurrArg <= NumArgs && - (lua_type( L, CurrArg ) == LUA_TSTRING || - lua_type( L, CurrArg ) == LUA_TTABLE ) ) + if( CurrArg <= NumArgs && lua_type( L, CurrArg ) == LUA_TSTRING ) { - EnumMemberBinder<RESOURCE_STATE_TRANSITION_MODE> StateTransitionModeLoader(0, "ClearRTStateTransitionMode", m_StateTransitionModeMapping); + EnumMemberBinder<RESOURCE_STATE_TRANSITION_MODE> StateTransitionModeLoader(0, "StateTransitionMode", m_StateTransitionModeMapping); StateTransitionModeLoader.SetValue( L, CurrArg, &StateTransitionMode ); ++CurrArg; } @@ -243,18 +237,16 @@ namespace Diligent } } - COMMIT_SHADER_RESOURCES_FLAGS Flags = COMMIT_SHADER_RESOURCES_FLAG_NONE; - if(NumArgs >= CurrArg && - (lua_type( L, CurrArg ) == LUA_TSTRING || - lua_type( L, CurrArg ) == LUA_TTABLE ) ) + RESOURCE_STATE_TRANSITION_MODE StateTransitionMode = RESOURCE_STATE_TRANSITION_MODE_NONE; + if( CurrArg <= NumArgs && lua_type( L, CurrArg ) == LUA_TSTRING ) { - FlagsLoader<COMMIT_SHADER_RESOURCES_FLAGS> CommitShaderResFlagsLoader(0, "CommitShaderResourcesFlag", m_CommitShaderResFlagsEnumMapping); - CommitShaderResFlagsLoader.SetValue( L, CurrArg, &Flags ); + EnumMemberBinder<RESOURCE_STATE_TRANSITION_MODE> StateTransitionModeLoader(0, "StateTransitionMode", m_StateTransitionModeMapping); + StateTransitionModeLoader.SetValue( L, CurrArg, &StateTransitionMode ); ++CurrArg; } auto *pContext = EngineObjectParserBase::LoadDeviceContextFromRegistry( L ); - pContext->CommitShaderResources( pShaderResBinding, Flags ); + pContext->CommitShaderResources( pShaderResBinding, StateTransitionMode ); return 0; } |