diff options
| author | azhirnov <zh1dron@gmail.com> | 2021-03-15 00:14:26 +0000 |
|---|---|---|
| committer | assiduous <assiduous@diligentgraphics.com> | 2021-03-19 00:38:23 +0000 |
| commit | 3efd89673b48bedffcf36b6b8c66d587512854a1 (patch) | |
| tree | 4b484320483b5b5d2ef2f0a90a78b3f5dadf095b /Graphics/GraphicsEngineOpenGL | |
| parent | Refactored D3D11 resource cache (diff) | |
| download | DiligentCore-3efd89673b48bedffcf36b6b8c66d587512854a1.tar.gz DiligentCore-3efd89673b48bedffcf36b6b8c66d587512854a1.zip | |
Added inline ray tracing & trace rays indirect command.
Diffstat (limited to 'Graphics/GraphicsEngineOpenGL')
3 files changed, 14 insertions, 3 deletions
diff --git a/Graphics/GraphicsEngineOpenGL/include/DeviceContextGLImpl.hpp b/Graphics/GraphicsEngineOpenGL/include/DeviceContextGLImpl.hpp index 867179af..f33b9d2c 100644 --- a/Graphics/GraphicsEngineOpenGL/include/DeviceContextGLImpl.hpp +++ b/Graphics/GraphicsEngineOpenGL/include/DeviceContextGLImpl.hpp @@ -261,6 +261,9 @@ public: /// Implementation of IDeviceContext::TraceRays() in OpenGL backend. virtual void DILIGENT_CALL_TYPE TraceRays(const TraceRaysAttribs& Attribs) override final; + /// Implementation of IDeviceContext::TraceRaysIndirect() in OpenGL backend. + virtual void DILIGENT_CALL_TYPE TraceRaysIndirect(const TraceRaysIndirectAttribs& Attribs, IBuffer* pAttribsBuffer) override final; + /// Implementation of IDeviceContextGL::UpdateCurrentGLContext(). virtual bool DILIGENT_CALL_TYPE UpdateCurrentGLContext() override final; diff --git a/Graphics/GraphicsEngineOpenGL/src/DeviceContextGLImpl.cpp b/Graphics/GraphicsEngineOpenGL/src/DeviceContextGLImpl.cpp index c613ca7d..9958c238 100644 --- a/Graphics/GraphicsEngineOpenGL/src/DeviceContextGLImpl.cpp +++ b/Graphics/GraphicsEngineOpenGL/src/DeviceContextGLImpl.cpp @@ -1648,4 +1648,9 @@ void DeviceContextGLImpl::TraceRays(const TraceRaysAttribs& Attribs) UNSUPPORTED("TraceRays is not supported in OpenGL"); } +void DeviceContextGLImpl::TraceRaysIndirect(const TraceRaysIndirectAttribs& Attribs, IBuffer* pAttribsBuffer) +{ + UNSUPPORTED("TraceRaysIndirect is not supported in OpenGL"); +} + } // namespace Diligent diff --git a/Graphics/GraphicsEngineOpenGL/src/RenderDeviceGLImpl.cpp b/Graphics/GraphicsEngineOpenGL/src/RenderDeviceGLImpl.cpp index 8cf07274..8950671e 100644 --- a/Graphics/GraphicsEngineOpenGL/src/RenderDeviceGLImpl.cpp +++ b/Graphics/GraphicsEngineOpenGL/src/RenderDeviceGLImpl.cpp @@ -302,9 +302,12 @@ RenderDeviceGLImpl::RenderDeviceGLImpl(IReferenceCounters* pRefCounters, } \ } while (false) + // clang-format off SET_FEATURE_STATE(VertexPipelineUAVWritesAndAtomics, false, "Vertex pipeline UAV writes and atomics are"); - SET_FEATURE_STATE(MeshShaders, false, "Mesh shaders are"); - SET_FEATURE_STATE(RayTracing, false, "Ray tracing is"); + SET_FEATURE_STATE(MeshShaders, false, "Mesh shaders are"); + SET_FEATURE_STATE(RayTracing, false, "Ray tracing is"); + SET_FEATURE_STATE(RayTracing2, false, "Inline ray tracing is"); + // clang-format on { bool WireframeFillSupported = (glPolygonMode != nullptr); @@ -457,7 +460,7 @@ RenderDeviceGLImpl::RenderDeviceGLImpl(IReferenceCounters* pRefCounters, #undef SET_FEATURE_STATE #if defined(_MSC_VER) && defined(_WIN64) - static_assert(sizeof(DeviceFeatures) == 33, "Did you add a new feature to DeviceFeatures? Please handle its satus here."); + static_assert(sizeof(DeviceFeatures) == 34, "Did you add a new feature to DeviceFeatures? Please handle its satus here."); #endif // get device limits |