From d62c8cba1043b20bde2b4def48eeb8752366c024 Mon Sep 17 00:00:00 2001 From: Egor Yusov Date: Sun, 2 Dec 2018 15:36:51 -0800 Subject: Replaced CLEAR_RENDER_TARGET_STATE_TRANSITION_MODE with RESOURCE_STATE_TRANSITION_MODE --- RenderScript/include/DeviceContextFuncBindings.h | 4 ++-- RenderScript/include/EnumMappings.h | 7 +++++++ RenderScript/src/EnumMappings.cpp | 7 +++++++ 3 files changed, 16 insertions(+), 2 deletions(-) (limited to 'RenderScript') diff --git a/RenderScript/include/DeviceContextFuncBindings.h b/RenderScript/include/DeviceContextFuncBindings.h index 308ff72..962c760 100644 --- a/RenderScript/include/DeviceContextFuncBindings.h +++ b/RenderScript/include/DeviceContextFuncBindings.h @@ -26,12 +26,12 @@ #include "LuaWrappers.h" #include "LuaBindings.h" #include "ClassMethodBinding.h" +#include "EnumMappings.h" namespace std { DEFINE_ENUM_HASH( Diligent::COMMIT_SHADER_RESOURCES_FLAGS ) DEFINE_ENUM_HASH( Diligent::SET_RENDER_TARGETS_FLAGS ) - DEFINE_ENUM_HASH( Diligent::CLEAR_RENDER_TARGET_STATE_TRANSITION_MODE ) DEFINE_ENUM_HASH( Diligent::CLEAR_DEPTH_STENCIL_FLAGS ) } @@ -66,7 +66,7 @@ namespace Diligent EnumMapping m_CommitShaderResFlagsEnumMapping; EnumMapping m_SetRenderTargetsFlagsEnumMapping; - EnumMapping m_ClearRTStateTransitionModeMapping; + StateTransitionModeEnumMapping m_StateTransitionModeMapping; EnumMapping m_ClearDepthStencilFlagsEnumMapping; String m_TexViewMetatableName; diff --git a/RenderScript/include/EnumMappings.h b/RenderScript/include/EnumMappings.h index db0b699..fc2b5ad 100644 --- a/RenderScript/include/EnumMappings.h +++ b/RenderScript/include/EnumMappings.h @@ -47,6 +47,7 @@ namespace std DEFINE_ENUM_HASH( Diligent::COMPARISON_FUNCTION ) DEFINE_ENUM_HASH( Diligent::BIND_SHADER_RESOURCES_FLAGS ) DEFINE_ENUM_HASH( Diligent::SHADER_TYPE ) + DEFINE_ENUM_HASH( Diligent::RESOURCE_STATE_TRANSITION_MODE ) } namespace Diligent @@ -112,4 +113,10 @@ namespace Diligent public: ShaderTypeEnumMapping(); }; + + class StateTransitionModeEnumMapping : public EnumMapping + { + public: + StateTransitionModeEnumMapping(); + }; } diff --git a/RenderScript/src/EnumMappings.cpp b/RenderScript/src/EnumMappings.cpp index 84ce7d9..53d1c13 100644 --- a/RenderScript/src/EnumMappings.cpp +++ b/RenderScript/src/EnumMappings.cpp @@ -224,4 +224,11 @@ namespace Diligent DEFINE_ENUM_ELEMENT_MAPPING( (*this), SHADER_TYPE_DOMAIN ); DEFINE_ENUM_ELEMENT_MAPPING( (*this), SHADER_TYPE_COMPUTE ); } + + StateTransitionModeEnumMapping::StateTransitionModeEnumMapping() + { + DEFINE_ENUM_ELEMENT_MAPPING( (*this), RESOURCE_STATE_TRANSITION_MODE_NONE ); + DEFINE_ENUM_ELEMENT_MAPPING( (*this), RESOURCE_STATE_TRANSITION_MODE_TRANSITION ); + DEFINE_ENUM_ELEMENT_MAPPING( (*this), RESOURCE_STATE_TRANSITION_MODE_VERIFY ); + } } -- cgit v1.2.3