Merge branch 'main_local' of github.com:Themperror/learnd3d11 into main_local

Author: deccer

src/Cpp/1-getting-started/1-2-3-NamingThings/1-2-3-NamingThings.vcxproj

@@ -111,18 +111,14 @@ xcopy /Y $(ProjectDir)Assets\Textures\*.* $(OutDir)Assets\Textures\</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="DeviceContext.cpp" />
     <ClCompile Include="Main.cpp" />
     <ClCompile Include="NamingThingsApplication.cpp" />
-    <ClCompile Include="Pipeline.cpp" />
-    <ClCompile Include="PipelineFactory.cpp" />
+    <ClCompile Include="ShaderCollection.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Definitions.hpp" />
-    <ClInclude Include="DeviceContext.hpp" />
     <ClInclude Include="NamingThingsApplication.hpp" />
-    <ClInclude Include="Pipeline.hpp" />
-    <ClInclude Include="PipelineFactory.hpp" />
+    <ClInclude Include="ShaderCollection.hpp" />
     <ClInclude Include="VertexType.hpp" />
   </ItemGroup>
   <ItemGroup>

src/Cpp/1-getting-started/1-2-3-NamingThings/1-2-3-NamingThings.vcxproj.filters

@@ -21,13 +21,7 @@
     <ClCompile Include="NamingThingsApplication.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="PipelineFactory.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="DeviceContext.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Pipeline.cpp">
+    <ClCompile Include="ShaderCollection.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
@@ -41,13 +35,7 @@
     <ClInclude Include="VertexType.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="PipelineFactory.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Pipeline.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="DeviceContext.hpp">
+    <ClInclude Include="ShaderCollection.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>

src/Cpp/1-getting-started/1-2-3-NamingThings/DeviceContext.cpp

@@ -1,7 +1,4 @@
 #include "NamingThingsApplication.hpp"
-#include "DeviceContext.hpp"
-#include "Pipeline.hpp"
-#include "PipelineFactory.hpp"
 #include "VertexType.hpp"
 
 #include <GLFW/glfw3.h>
@@ -35,12 +32,10 @@ NamingThingsApplication::~NamingThingsApplication()
 {
     _deviceContext->Flush();
     _triangleVertices.Reset();
-    _pipeline.reset();
-    _pipelineFactory.reset();
     DestroySwapchainResources();
     _swapChain.Reset();
     _dxgiFactory.Reset();
-    _deviceContext.reset();
+    _deviceContext.Reset();
 #if !defined(NDEBUG)
     _debug->ReportLiveDeviceObjects(D3D11_RLDO_FLAGS::D3D11_RLDO_DETAIL);
     _debug.Reset();
@@ -90,7 +85,7 @@ bool NamingThingsApplication::Initialize()
     _device->SetPrivateData(WKPDID_D3DDebugObjectName, sizeof(deviceName), deviceName);
     SetDebugName(deviceContext.Get(), "CTX_Main");
 
-    _deviceContext = std::make_unique<DeviceContext>(std::move(deviceContext));
+    _deviceContext = deviceContext;
 
     if (FAILED(_device.As(&_debug)))
     {
@@ -127,28 +122,17 @@ bool NamingThingsApplication::Initialize()
 
     CreateSwapchainResources();
 
-    _pipelineFactory = std::make_unique<PipelineFactory>(_device);
 
     return true;
 }
 
 bool NamingThingsApplication::Load()
 {
-    PipelineDescriptor pipelineDescriptor = {};
-    pipelineDescriptor.VertexFilePath = L"Assets/Shaders/Main.vs.hlsl";
-    pipelineDescriptor.PixelFilePath = L"Assets/Shaders/Main.ps.hlsl";
-    pipelineDescriptor.VertexType = VertexType::PositionColor;
-    if (!_pipelineFactory->CreatePipeline(pipelineDescriptor, _pipeline))
-    {
-        std::cout << "PipelineFactory: Failed to create pipeline\n";
-        return false;
-    }
-
-    _pipeline->SetViewport(
-        0.0f,
-        0.0f,
-        static_cast<float>(GetWindowWidth()),
-        static_cast<float>(GetWindowHeight()));
+    ShaderCollectionDescriptor shaderCollectionDescriptor = {};
+    shaderCollectionDescriptor.VertexShaderFilePath = L"Assets/Shaders/Main.vs.hlsl";
+    shaderCollectionDescriptor.PixelShaderFilePath = L"Assets/Shaders/Main.ps.hlsl";
+    shaderCollectionDescriptor.VertexType = VertexType::PositionColor;
+    _shaderCollection = ShaderCollection::CreateShaderCollection(shaderCollectionDescriptor, _device.Get());
 
     constexpr VertexPositionColor vertices[] = {
         {  Position{ 0.0f, 0.5f, 0.0f }, Color{ 0.25f, 0.39f, 0.19f }},
@@ -234,11 +218,38 @@ void NamingThingsApplication::Update()
 void NamingThingsApplication::Render()
 {
     float clearColor[] = { 0.1f, 0.1f, 0.1f, 1.0f };
+    ID3D11RenderTargetView* nullRTV = nullptr;
     constexpr uint32_t vertexOffset = 0;
 
-    _deviceContext->Clear(_renderTarget.Get(), clearColor);
-    _deviceContext->SetPipeline(_pipeline.get());
-    _deviceContext->SetVertexBuffer(_triangleVertices.Get(), vertexOffset);
-    _deviceContext->Draw();
+    D3D11_VIEWPORT viewport = {
+        0.0f,
+        0.0f,
+        static_cast<float>(GetWindowWidth()),
+        static_cast<float>(GetWindowHeight()),
+        0.0f,
+        1.0f
+    };
+
+    _deviceContext->RSSetViewports(1, &viewport);
+    _deviceContext->IASetPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY::D3D11_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+
+    _shaderCollection.ApplyToContext(_deviceContext.Get());
+
+
+    _deviceContext->OMSetRenderTargets(1, &nullRTV, nullptr);
+
+    _deviceContext->ClearRenderTargetView(_renderTarget.Get(), clearColor);
+    _deviceContext->OMSetRenderTargets(1, _renderTarget.GetAddressOf(), nullptr);
+
+    UINT stride = _shaderCollection.GetLayoutByteSize(VertexType::PositionColor);
+
+    _deviceContext->IASetVertexBuffers(
+        0,
+        1,
+        _triangleVertices.GetAddressOf(),
+        &stride,
+        &vertexOffset);
+
+    _deviceContext->Draw(3, 0);
     _swapChain->Present(1, 0);
 }

src/Cpp/1-getting-started/1-2-3-NamingThings/DeviceContext.hpp

@@ -7,9 +7,7 @@
 
 #include <memory>
 
-class DeviceContext;
-class Pipeline;
-class PipelineFactory;
+#include "ShaderCollection.hpp"
 
 class NamingThingsApplication final : public Application
 {
@@ -30,14 +28,13 @@ class NamingThingsApplication final : public Application
     bool CreateSwapchainResources();
     void DestroySwapchainResources();
 
-    std::unique_ptr<DeviceContext> _deviceContext = nullptr;
-    std::unique_ptr<Pipeline> _pipeline = nullptr;
-    std::unique_ptr<PipelineFactory> _pipelineFactory = nullptr;
-
+    WRL::ComPtr<ID3D11DeviceContext> _deviceContext = nullptr;
     WRL::ComPtr<ID3D11Device> _device = nullptr;
     WRL::ComPtr<IDXGIFactory2> _dxgiFactory = nullptr;
     WRL::ComPtr<IDXGISwapChain1> _swapChain = nullptr;
     WRL::ComPtr<ID3D11RenderTargetView> _renderTarget = nullptr;
     WRL::ComPtr<ID3D11Buffer> _triangleVertices = nullptr;
     WRL::ComPtr<ID3D11Debug> _debug = nullptr;
+
+    ShaderCollection _shaderCollection;
 };