2 files changed, 13 insertions, 23 deletions
diff --git a/tools/gfx/cuda/render-cuda.cpp b/tools/gfx/cuda/render-cuda.cpp
index 3e94f5571..dbdc27628 100644
--- a/tools/gfx/cuda/render-cuda.cpp
+++ b/tools/gfx/cuda/render-cuda.cpp
@@ -14,6 +14,19 @@
 #include "../renderer-shared.h"
 #include "../render-graphics-common.h"
 #include "../slang-context.h"
+
+#   ifdef RENDER_TEST_OPTIX
+
+// The `optix_stubs.h` header produces warnings when compiled with MSVC
+#       ifdef _MSC_VER
+#           pragma warning(disable: 4996)
+#       endif
+
+#       include <optix.h>
+#       include <optix_function_table_definition.h>
+#       include <optix_stubs.h>
+#   endif
+
 #endif
 
 namespace gfx
diff --git a/tools/gfx/d3d11/render-d3d11.cpp b/tools/gfx/d3d11/render-d3d11.cpp
index 1310e99ae..840703c37 100644
--- a/tools/gfx/d3d11/render-d3d11.cpp
+++ b/tools/gfx/d3d11/render-d3d11.cpp
@@ -171,29 +171,6 @@ protected:
         D3D11Device* m_renderer;
     };
 
-#if 0
-    struct BindingDetail
-    {
-        ComPtr<ID3D11ShaderResourceView>    m_srv;
-        ComPtr<ID3D11UnorderedAccessView>   m_uav;
-        ComPtr<ID3D11SamplerState>          m_samplerState;
-    };
-
-    class BindingStateImpl: public BindingState
-    {
-		public:
-        typedef BindingState Parent;
-
-            /// Ctor
-        BindingStateImpl(const Desc& desc):
-            Parent(desc)
-        {}
-
-        List<BindingDetail> m_bindingDetails;
-    };
-#endif
-
-    
     enum class D3D11DescriptorSlotType
     {
         ConstantBuffer,