diff options
| author | assiduous <assiduous@diligentgraphics.com> | 2020-12-21 05:05:55 +0000 |
|---|---|---|
| committer | assiduous <assiduous@diligentgraphics.com> | 2020-12-21 05:05:55 +0000 |
| commit | 8522b86199fc6fb7238946081acecde986c20957 (patch) | |
| tree | 5e758284c0239482867cf094c74155c8ee33a4b2 /Graphics/GraphicsEngine | |
| parent | ShaderResourceLayoutD3D12: more debug validation plus few more minor improvem... (diff) | |
| download | DiligentCore-8522b86199fc6fb7238946081acecde986c20957.tar.gz DiligentCore-8522b86199fc6fb7238946081acecde986c20957.zip | |
Removed SBTTransitionMode from TraceRaysAttribs
Diffstat (limited to 'Graphics/GraphicsEngine')
| -rw-r--r-- | Graphics/GraphicsEngine/include/DeviceContextBase.hpp | 4 | ||||
| -rw-r--r-- | Graphics/GraphicsEngine/interface/DeviceContext.h | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/Graphics/GraphicsEngine/include/DeviceContextBase.hpp b/Graphics/GraphicsEngine/include/DeviceContextBase.hpp index ba028dd3..8c4c685c 100644 --- a/Graphics/GraphicsEngine/include/DeviceContextBase.hpp +++ b/Graphics/GraphicsEngine/include/DeviceContextBase.hpp @@ -1648,9 +1648,9 @@ bool DeviceContextBase<BaseInterface, ImplementationTraits>::TraceRays(const Tra return false; } - if (m_pActiveRenderPass != nullptr && Attribs.SBTTransitionMode == RESOURCE_STATE_TRANSITION_MODE_TRANSITION) + if (m_pActiveRenderPass != nullptr) { - LOG_ERROR_MESSAGE("IDeviceContext::TraceRays command uses resource state transition and must be performed outside of render pass"); + LOG_ERROR_MESSAGE("IDeviceContext::TraceRays must be performed outside of render pass"); return false; } diff --git a/Graphics/GraphicsEngine/interface/DeviceContext.h b/Graphics/GraphicsEngine/interface/DeviceContext.h index 73e2640c..fa9ca273 100644 --- a/Graphics/GraphicsEngine/interface/DeviceContext.h +++ b/Graphics/GraphicsEngine/interface/DeviceContext.h @@ -1229,10 +1229,7 @@ struct TraceRaysAttribs Uint32 DimensionX DEFAULT_INITIALIZER(1); ///< The number of rays dispatched in X direction. Uint32 DimensionY DEFAULT_INITIALIZER(1); ///< The number of rays dispatched in Y direction. Uint32 DimensionZ DEFAULT_INITIALIZER(1); ///< The number of rays dispatched in Z direction. - - /// Shader binding table buffer state transition mode (see Diligent::RESOURCE_STATE_TRANSITION_MODE). - RESOURCE_STATE_TRANSITION_MODE SBTTransitionMode DEFAULT_INITIALIZER(RESOURCE_STATE_TRANSITION_MODE_NONE); - + #if DILIGENT_CPP_INTERFACE TraceRaysAttribs() noexcept {} #endif @@ -2198,6 +2195,9 @@ DILIGENT_BEGIN_INTERFACE(IDeviceContext, IObject) /// Executes a trace rays command. /// \param [in] Attribs - Trace rays command attributes, see Diligent::TraceRaysAttribs for details. + /// + /// \remarks The method is not thread-safe. An application must externally synchronize the access + /// to the shader binding table passed as an argument to the function. VIRTUAL void METHOD(TraceRays)(THIS_ const TraceRaysAttribs REF Attribs) PURE; }; |