cleanup (#39)

* rename SamplerBase -> Sampler

* rename AccelerationStructureBase -> AccelerationStructure

* rename PipelineBase -> Pipeline

* rename InputLayoutBase -> InputLayout

* rename QueryPoolBase -> QueryPool

* rename TransientResourceHeapBase -> TransientResourceHeap

* rename ShaderTableBase -> ShaderTable

* rename ShaderObjectLayoutBase -> ShaderObjectLayout

* rename ShaderProgramBase -> ShaderProgram

* rename RendererBase -> Device

* rename FenceBase -> Fence

* format code

* rename getRenderer() -> getDevice()

* cleanup

* rename ImmediateRendererBase -> ImmediateDevice

* rename renderer.cpp -> rhi.cpp, renderer-shared -> rhi-shared

* rename renderer -> device

* rename m_renderer -> m_device

include/slang-rhi.h

@@ -2182,7 +2182,7 @@ class IDevice : public ISlangUnknown
 
     virtual SLANG_NO_THROW bool SLANG_MCALL hasFeature(const char* feature) = 0;
 
-    /// Returns a list of features supported by the renderer.
+    /// Returns a list of features supported by the device.
     virtual SLANG_NO_THROW Result SLANG_MCALL
     getFeatures(const char** outFeatures, Size bufferSize, GfxCount* outFeatureCount) = 0;
 
@@ -2426,7 +2426,7 @@ class IDevice : public ISlangUnknown
     virtual SLANG_NO_THROW SlangResult SLANG_MCALL
     readBuffer(IBuffer* buffer, Offset offset, Size size, ISlangBlob** outBlob) = 0;
 
-    /// Get the type of this renderer
+    /// Get information about the device.
     virtual SLANG_NO_THROW const DeviceInfo& SLANG_MCALL getDeviceInfo() const = 0;
 
     virtual SLANG_NO_THROW Result SLANG_MCALL createQueryPool(const QueryPoolDesc& desc, IQueryPool** outPool) = 0;

src/command-writer.h

@@ -2,7 +2,7 @@
 
 #include <slang-rhi.h>
 
-#include "renderer-shared.h"
+#include "rhi-shared.h"
 
 #include "core/common.h"
 
@@ -129,7 +129,7 @@ class CommandWriter
 
     void setPipeline(IPipeline* state)
     {
-        auto offset = encodeObject(static_cast<PipelineBase*>(state));
+        auto offset = encodeObject(static_cast<Pipeline*>(state));
         m_commands.push_back(Command(CommandName::SetPipeline, (uint32_t)offset));
     }
 
@@ -301,7 +301,7 @@ class CommandWriter
 
     void writeTimestamp(IQueryPool* pool, GfxIndex index)
     {
-        auto poolOffset = encodeObject(static_cast<QueryPoolBase*>(pool));
+        auto poolOffset = encodeObject(static_cast<QueryPool*>(pool));
         m_commands.push_back(Command(CommandName::WriteTimestamp, (uint32_t)poolOffset, (uint32_t)index));
         m_hasWriteTimestamps = true;
     }

src/cpu/cpu-base.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../immediate-renderer-base.h"
+#include "../immediate-device.h"
 #include "../mutable-shader-object.h"
 #include "../slang-context.h"
 #define SLANG_PRELUDE_NAMESPACE slang_prelude

src/cpu/cpu-buffer.h

@@ -7,7 +7,7 @@ namespace rhi::cpu {
 class BufferImpl : public Buffer
 {
 public:
-    BufferImpl(RendererBase* device, const BufferDesc& desc)
+    BufferImpl(Device* device, const BufferDesc& desc)
         : Buffer(device, desc)
     {
     }

src/cpu/cpu-device.cpp

@@ -29,7 +29,7 @@ Result DeviceImpl::initialize(const Desc& desc)
         make_array(slang::PreprocessorMacroDesc{"__CPU__", "1"})
     ));
 
-    SLANG_RETURN_ON_FAIL(RendererBase::initialize(desc));
+    SLANG_RETURN_ON_FAIL(Device::initialize(desc));
 
     // Initialize DeviceInfo
     {
@@ -88,7 +88,7 @@ Result DeviceImpl::createTextureView(ITexture* texture, const TextureViewDesc& d
 Result DeviceImpl::createShaderObjectLayout(
     slang::ISession* session,
     slang::TypeLayoutReflection* typeLayout,
-    ShaderObjectLayoutBase** outLayout
+    ShaderObjectLayout** outLayout
 )
 {
     RefPtr<ShaderObjectLayoutImpl> cpuLayout = new ShaderObjectLayoutImpl(this, session, typeLayout);
@@ -97,7 +97,7 @@ Result DeviceImpl::createShaderObjectLayout(
     return SLANG_OK;
 }
 
-Result DeviceImpl::createShaderObject(ShaderObjectLayoutBase* layout, IShaderObject** outObject)
+Result DeviceImpl::createShaderObject(ShaderObjectLayout* layout, IShaderObject** outObject)
 {
     auto cpuLayout = static_cast<ShaderObjectLayoutImpl*>(layout);
 
@@ -108,7 +108,7 @@ Result DeviceImpl::createShaderObject(ShaderObjectLayoutBase* layout, IShaderObj
     return SLANG_OK;
 }
 
-Result DeviceImpl::createMutableShaderObject(ShaderObjectLayoutBase* layout, IShaderObject** outObject)
+Result DeviceImpl::createMutableShaderObject(ShaderObjectLayout* layout, IShaderObject** outObject)
 {
     auto cpuLayout = static_cast<ShaderObjectLayoutImpl*>(layout);
 
@@ -220,7 +220,7 @@ void DeviceImpl::dispatchCompute(int x, int y, int z)
     int targetIndex = 0;
 
     // Specialize the compute kernel based on the shader object bindings.
-    RefPtr<PipelineBase> newPipeline;
+    RefPtr<Pipeline> newPipeline;
     maybeSpecializePipeline(m_currentPipeline, m_currentRootObject, newPipeline);
     m_currentPipeline = static_cast<PipelineImpl*>(newPipeline.Ptr());
 

src/cpu/cpu-device.h

@@ -25,12 +25,12 @@ class DeviceImpl : public ImmediateComputeDeviceBase
     virtual Result createShaderObjectLayout(
         slang::ISession* session,
         slang::TypeLayoutReflection* typeLayout,
-        ShaderObjectLayoutBase** outLayout
+        ShaderObjectLayout** outLayout
     ) override;
 
-    virtual Result createShaderObject(ShaderObjectLayoutBase* layout, IShaderObject** outObject) override;
+    virtual Result createShaderObject(ShaderObjectLayout* layout, IShaderObject** outObject) override;
 
-    virtual Result createMutableShaderObject(ShaderObjectLayoutBase* layout, IShaderObject** outObject) override;
+    virtual Result createMutableShaderObject(ShaderObjectLayout* layout, IShaderObject** outObject) override;
 
     virtual Result createRootShaderObject(IShaderProgram* program, ShaderObjectBase** outObject) override;
 

src/cpu/cpu-pipeline.h

@@ -4,7 +4,7 @@
 
 namespace rhi::cpu {
 
-class PipelineImpl : public PipelineBase
+class PipelineImpl : public Pipeline
 {
 public:
     ShaderProgramImpl* getProgram();

src/cpu/cpu-query.h

@@ -4,7 +4,7 @@
 
 namespace rhi::cpu {
 
-class QueryPoolImpl : public QueryPoolBase
+class QueryPoolImpl : public QueryPool
 {
 public:
     std::vector<uint64_t> m_queries;

src/cpu/cpu-shader-object-layout.cpp

@@ -3,12 +3,12 @@
 namespace rhi::cpu {
 
 ShaderObjectLayoutImpl::ShaderObjectLayoutImpl(
-    RendererBase* renderer,
+    Device* device,
     slang::ISession* session,
     slang::TypeLayoutReflection* layout
 )
 {
-    initBase(renderer, session, layout);
+    initBase(device, session, layout);
 
     m_subObjectCount = 0;
     m_resourceCount = 0;
@@ -102,7 +102,7 @@ ShaderObjectLayoutImpl::ShaderObjectLayoutImpl(
         if (slangBindingType != slang::BindingType::ExistentialValue)
         {
             subObjectLayout =
-                new ShaderObjectLayoutImpl(renderer, m_slangSession, slangLeafTypeLayout->getElementTypeLayout());
+                new ShaderObjectLayoutImpl(device, m_slangSession, slangLeafTypeLayout->getElementTypeLayout());
         }
 
         SubObjectRangeInfo subObjectRange;
@@ -144,17 +144,16 @@ const char* EntryPointLayoutImpl::getEntryPointName()
 }
 
 RootShaderObjectLayoutImpl::RootShaderObjectLayoutImpl(
-    RendererBase* renderer,
+    Device* device,
     slang::ISession* session,
     slang::ProgramLayout* programLayout
 )
-    : ShaderObjectLayoutImpl(renderer, session, programLayout->getGlobalParamsTypeLayout())
+    : ShaderObjectLayoutImpl(device, session, programLayout->getGlobalParamsTypeLayout())
     , m_programLayout(programLayout)
 {
     for (UInt i = 0; i < programLayout->getEntryPointCount(); i++)
     {
-        m_entryPointLayouts.push_back(
-            new EntryPointLayoutImpl(renderer, session, programLayout->getEntryPointByIndex(i))
+        m_entryPointLayouts.push_back(new EntryPointLayoutImpl(device, session, programLayout->getEntryPointByIndex(i))
         );
     }
 }

src/cpu/cpu-shader-object-layout.h

@@ -35,7 +35,7 @@ struct SubObjectRangeInfo
     Index bindingRangeIndex;
 };
 
-class ShaderObjectLayoutImpl : public ShaderObjectLayoutBase
+class ShaderObjectLayoutImpl : public ShaderObjectLayout
 {
 public:
     // TODO: Once memory lifetime stuff is handled, there is
@@ -49,7 +49,7 @@ class ShaderObjectLayoutImpl : public ShaderObjectLayoutBase
     Index m_subObjectCount = 0;
     Index m_resourceCount = 0;
 
-    ShaderObjectLayoutImpl(RendererBase* renderer, slang::ISession* session, slang::TypeLayoutReflection* layout);
+    ShaderObjectLayoutImpl(Device* device, slang::ISession* session, slang::TypeLayoutReflection* layout);
 
     size_t getSize();
     Index getResourceCount() const;
@@ -65,8 +65,8 @@ class EntryPointLayoutImpl : public ShaderObjectLayoutImpl
     slang::EntryPointLayout* m_entryPointLayout = nullptr;
 
 public:
-    EntryPointLayoutImpl(RendererBase* renderer, slang::ISession* session, slang::EntryPointLayout* entryPointLayout)
-        : ShaderObjectLayoutImpl(renderer, session, entryPointLayout->getTypeLayout())
+    EntryPointLayoutImpl(Device* device, slang::ISession* session, slang::EntryPointLayout* entryPointLayout)
+        : ShaderObjectLayoutImpl(device, session, entryPointLayout->getTypeLayout())
         , m_entryPointLayout(entryPointLayout)
     {
     }
@@ -80,7 +80,7 @@ class RootShaderObjectLayoutImpl : public ShaderObjectLayoutImpl
     slang::ProgramLayout* m_programLayout = nullptr;
     std::vector<RefPtr<EntryPointLayoutImpl>> m_entryPointLayouts;
 
-    RootShaderObjectLayoutImpl(RendererBase* renderer, slang::ISession* session, slang::ProgramLayout* programLayout);
+    RootShaderObjectLayoutImpl(Device* device, slang::ISession* session, slang::ProgramLayout* programLayout);
 
     int getKernelIndex(std::string_view kernelName);
     void getKernelThreadGroupSize(int kernelIndex, UInt* threadGroupSizes);

src/cpu/cpu-shader-object.cpp

@@ -32,7 +32,7 @@ CPUShaderObjectData::~CPUShaderObjectData()
 /// Returns a StructuredBuffer resource view for GPU access into the buffer content.
 /// Creates a StructuredBuffer resource if it has not been created.
 Buffer* CPUShaderObjectData::getBufferResource(
-    RendererBase* device,
+    Device* device,
     slang::TypeLayoutReflection* elementLayout,
     slang::BindingType bindingType
 )

src/cpu/cpu-shader-object.h

@@ -21,7 +21,7 @@ class CPUShaderObjectData
     /// Returns a StructuredBuffer resource view for GPU access into the buffer content.
     /// Creates a StructuredBuffer resource if it has not been created.
     Buffer* getBufferResource(
-        RendererBase* device,
+        Device* device,
         slang::TypeLayoutReflection* elementLayout,
         slang::BindingType bindingType
     );

src/cpu/cpu-shader-program.h

@@ -5,7 +5,7 @@
 
 namespace rhi::cpu {
 
-class ShaderProgramImpl : public ShaderProgramBase
+class ShaderProgramImpl : public ShaderProgram
 {
 public:
     RefPtr<RootShaderObjectLayoutImpl> layout;

src/cpu/cpu-texture-view.h

@@ -9,7 +9,7 @@ namespace rhi::cpu {
 class TextureViewImpl : public TextureView, public slang_prelude::IRWTexture
 {
 public:
-    TextureViewImpl(RendererBase* device, const TextureViewDesc& desc)
+    TextureViewImpl(Device* device, const TextureViewDesc& desc)
         : TextureView(device, desc)
     {
     }

src/cpu/cpu-texture.h

@@ -96,7 +96,7 @@ class TextureImpl : public Texture
     };
 
 public:
-    TextureImpl(RendererBase* device, const TextureDesc& desc)
+    TextureImpl(Device* device, const TextureDesc& desc)
         : Texture(device, desc)
     {
     }

src/cuda/cuda-base.h

@@ -5,7 +5,7 @@
 #include "../command-encoder-com-forward.h"
 #include "../command-writer.h"
 #include "../mutable-shader-object.h"
-#include "../renderer-shared.h"
+#include "../rhi-shared.h"
 #include "../simple-transient-resource-heap.h"
 #include "../slang-context.h"
 

src/cuda/cuda-buffer.h

@@ -8,7 +8,7 @@ namespace rhi::cuda {
 class BufferImpl : public Buffer
 {
 public:
-    BufferImpl(RendererBase* device, const BufferDesc& desc)
+    BufferImpl(Device* device, const BufferDesc& desc)
         : Buffer(device, desc)
     {
     }

src/cuda/cuda-command-buffer.cpp

@@ -9,7 +9,7 @@ ICommandBuffer* CommandBufferImpl::getInterface(const Guid& guid)
     return nullptr;
 }
 
-void CommandBufferImpl::init(DeviceImpl* device, TransientResourceHeapBase* transientHeap)
+void CommandBufferImpl::init(DeviceImpl* device, TransientResourceHeap* transientHeap)
 {
     m_device = device;
     m_transientHeap = transientHeap;

src/cuda/cuda-command-buffer.h

@@ -13,11 +13,11 @@ class CommandBufferImpl : public ICommandBuffer, public CommandWriter, public Co
 
 public:
     DeviceImpl* m_device;
-    TransientResourceHeapBase* m_transientHeap;
+    TransientResourceHeap* m_transientHeap;
     ResourceCommandEncoderImpl m_resourceCommandEncoder;
     ComputeCommandEncoderImpl m_computeCommandEncoder;
 
-    void init(DeviceImpl* device, TransientResourceHeapBase* transientHeap);
+    void init(DeviceImpl* device, TransientResourceHeap* transientHeap);
 
     virtual SLANG_NO_THROW Result SLANG_MCALL encodeResourceCommands(IResourceCommandEncoder** outEncoder) override;
     virtual SLANG_NO_THROW Result SLANG_MCALL

src/cuda/cuda-command-encoder.cpp

@@ -199,7 +199,7 @@ void ComputeCommandEncoderImpl::init(CommandBufferImpl* cmdBuffer)
 Result ComputeCommandEncoderImpl::bindPipeline(IPipeline* state, IShaderObject** outRootObject)
 {
     m_writer->setPipeline(state);
-    PipelineBase* pipelineImpl = static_cast<PipelineBase*>(state);
+    Pipeline* pipelineImpl = static_cast<Pipeline*>(state);
     SLANG_RETURN_ON_FAIL(
         m_commandBuffer->m_device->createRootShaderObject(pipelineImpl->m_program, m_rootObject.writeRef())
     );
@@ -210,7 +210,7 @@ Result ComputeCommandEncoderImpl::bindPipeline(IPipeline* state, IShaderObject**
 Result ComputeCommandEncoderImpl::bindPipelineWithRootObject(IPipeline* state, IShaderObject* rootObject)
 {
     m_writer->setPipeline(state);
-    PipelineBase* pipelineImpl = static_cast<PipelineBase*>(state);
+    Pipeline* pipelineImpl = static_cast<Pipeline*>(state);
     SLANG_RETURN_ON_FAIL(
         m_commandBuffer->m_device->createRootShaderObject(pipelineImpl->m_program, m_rootObject.writeRef())
     );

src/cuda/cuda-command-queue.cpp

@@ -13,9 +13,9 @@ ICommandQueue* CommandQueueImpl::getInterface(const Guid& guid)
     return nullptr;
 }
 
-void CommandQueueImpl::init(DeviceImpl* inRenderer)
+void CommandQueueImpl::init(DeviceImpl* device)
 {
-    renderer = inRenderer;
+    m_device = device;
     m_desc.type = ICommandQueue::QueueType::Graphics;
     cuStreamCreate(&stream, 0);
 }
@@ -78,8 +78,8 @@ Result CommandQueueImpl::bindRootShaderObject(IShaderObject* object)
 void CommandQueueImpl::dispatchCompute(int x, int y, int z)
 {
     // Specialize the compute kernel based on the shader object bindings.
-    RefPtr<PipelineBase> newPipeline;
-    renderer->maybeSpecializePipeline(currentPipeline, currentRootObject, newPipeline);
+    RefPtr<Pipeline> newPipeline;
+    m_device->maybeSpecializePipeline(currentPipeline, currentRootObject, newPipeline);
     currentPipeline = static_cast<ComputePipelineImpl*>(newPipeline.Ptr());
 
     // Find out thread group size from program reflection.
@@ -169,7 +169,7 @@ void CommandQueueImpl::execute(CommandBufferImpl* commandBuffer)
         switch (cmd.name)
         {
         case CommandName::SetPipeline:
-            setPipeline(commandBuffer->getObject<PipelineBase>(cmd.operands[0]));
+            setPipeline(commandBuffer->getObject<Pipeline>(cmd.operands[0]));
             break;
         case CommandName::BindRootShaderObject:
             bindRootShaderObject(commandBuffer->getObject<ShaderObjectBase>(cmd.operands[0]));
@@ -195,7 +195,7 @@ void CommandQueueImpl::execute(CommandBufferImpl* commandBuffer)
             );
             break;
         case CommandName::WriteTimestamp:
-            writeTimestamp(commandBuffer->getObject<QueryPoolBase>(cmd.operands[0]), (SlangInt)cmd.operands[1]);
+            writeTimestamp(commandBuffer->getObject<QueryPool>(cmd.operands[0]), (SlangInt)cmd.operands[1]);
         }
     }
 }

src/cuda/cuda-command-queue.h

@@ -17,7 +17,7 @@ class CommandQueueImpl : public ICommandQueue, public ComObject
 
     RefPtr<ComputePipelineImpl> currentPipeline;
     RefPtr<RootShaderObjectImpl> currentRootObject;
-    RefPtr<DeviceImpl> renderer;
+    RefPtr<DeviceImpl> m_device;
     CUstream stream;
     Desc m_desc;