Fix up 1-3-2 and later with changes to ShaderCollection and refactor into nonabstraction

Author: Floyd Huizinga

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

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

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

@@ -21,9 +21,6 @@
     <ClCompile Include="TexturingApplication.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="DeviceContext.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="ShaderCollection.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -38,9 +35,6 @@
     <ClInclude Include="VertexType.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="DeviceContext.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="ShaderCollection.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>

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

@@ -1,7 +1,5 @@
 #include "TexturingApplication.hpp"
-#include "DeviceContext.hpp"
-#include "Pipeline.hpp"
-#include "PipelineFactory.hpp"
+#include "ShaderCollection.hpp"
 
 #include <GLFW/glfw3.h>
 #define GLFW_EXPOSE_NATIVE_WIN32
@@ -44,12 +42,13 @@ TexturingApplication::~TexturingApplication()
     _deviceContext->Flush();
     _textureSrv.Reset();
     _triangleVertices.Reset();
-    _pipeline.reset();
-    _pipelineFactory.reset();
+    _linearSamplerState.Reset();
+    _rasterState.Reset();
+    _shaderCollection.Destroy();
     DestroySwapchainResources();
     _swapChain.Reset();
     _dxgiFactory.Reset();
-    _deviceContext.reset();
+    _deviceContext.Reset();
 #if !defined(NDEBUG)
     _debug->ReportLiveDeviceObjects(D3D11_RLDO_FLAGS::D3D11_RLDO_DETAIL);
     _debug.Reset();
@@ -101,12 +100,12 @@ bool TexturingApplication::Initialize()
     }
 #endif
 
+    _deviceContext = deviceContext;
+
     constexpr char deviceName[] = "DEV_Main";
     _device->SetPrivateData(WKPDID_D3DDebugObjectName, sizeof(deviceName), deviceName);
     SetDebugName(deviceContext.Get(), "CTX_Main");
 
-    _deviceContext = std::make_unique<DeviceContext>(std::move(deviceContext));
-
     DXGI_SWAP_CHAIN_DESC1 swapChainDescriptor = {};
     swapChainDescriptor.Width = GetWindowWidth();
     swapChainDescriptor.Height = GetWindowHeight();
@@ -136,8 +135,6 @@ bool TexturingApplication::Initialize()
 
     CreateSwapchainResources();
 
-    _pipelineFactory = std::make_unique<PipelineFactory>(_device);
-
     FreeImage_Initialise();
     return true;
 }
@@ -296,21 +293,11 @@ WRL::ComPtr<ID3D11ShaderResourceView> CreateTextureView(ID3D11Device* device, co
 
 bool TexturingApplication::Load()
 {
-    PipelineDescriptor pipelineDescriptor = {};
-    pipelineDescriptor.VertexFilePath = L"Assets/Shaders/Main.vs.hlsl";
-    pipelineDescriptor.PixelFilePath = L"Assets/Shaders/Main.ps.hlsl";
-    pipelineDescriptor.VertexType = VertexType::PositionColorUv;
-    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::PositionColorUv;
+    _shaderCollection = ShaderCollection::CreateShaderCollection(shaderCollectionDescriptor, _device.Get());
 
     constexpr VertexPositionColorUv vertices[] = {
         {  Position{ 0.0f, 0.5f, 0.0f }, Color{ 0.25f, 0.39f, 0.19f }, Uv{ 0.5f, 0.0f }},
@@ -344,8 +331,6 @@ bool TexturingApplication::Load()
         _textureSrv = _fallbackTextureSrv;
     }
 
-    _pipeline->BindTexture(0, _textureSrv.Get());
-
     D3D11_SAMPLER_DESC linearSamplerStateDescriptor = {};
     linearSamplerStateDescriptor.Filter = D3D11_FILTER::D3D11_FILTER_MIN_MAG_LINEAR_MIP_POINT;
     linearSamplerStateDescriptor.AddressU = D3D11_TEXTURE_ADDRESS_MODE::D3D11_TEXTURE_ADDRESS_WRAP;
@@ -357,7 +342,6 @@ bool TexturingApplication::Load()
         return false;
     }
 
-    _pipeline->BindSampler(0, _linearSamplerState.Get());
 
     return true;
 }
@@ -423,9 +407,43 @@ void TexturingApplication::Render()
     float clearColor[] = { 0.1f, 0.1f, 0.1f, 1.0f };
     constexpr uint32_t vertexOffset = 0;
 
-    _deviceContext->Clear(_renderTarget.Get(), clearColor);
-    _deviceContext->SetPipeline(_pipeline.get());
-    _deviceContext->SetVertexBuffer(_triangleVertices.Get(), vertexOffset);
-    _deviceContext->Draw();
+    ID3D11RenderTargetView* nullTarget = nullptr;
+
+    //set to 0 so we can clear properly
+    _deviceContext->OMSetRenderTargets(1, &nullTarget, nullptr);
+    _deviceContext->ClearRenderTargetView(_renderTarget.Get(), clearColor);
+
+    _deviceContext->OMSetRenderTargets(1, _renderTarget.GetAddressOf(), nullptr);
+
+    _deviceContext->IASetPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY::D3D10_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+
+    D3D11_BUFFER_DESC description = {};
+    _triangleVertices->GetDesc(&description);
+    UINT stride = sizeof(VertexPositionColorUv);
+    _deviceContext->IASetVertexBuffers(
+        0,
+        1,
+        _triangleVertices.GetAddressOf(),
+        &stride,
+        &vertexOffset);
+
+    _shaderCollection.ApplyToContext(_deviceContext.Get());
+
+    D3D11_VIEWPORT viewport = {
+        0.0f,
+        0.0f,
+        static_cast<float>(GetWindowWidth()),
+        static_cast<float>(GetWindowHeight()),
+        0.0f,
+        1.0f
+    };
+
+    _deviceContext->RSSetViewports(1, &viewport);
+    _deviceContext->RSSetState(_rasterState.Get());
+
+    _deviceContext->PSSetShaderResources(0, 1, _textureSrv.GetAddressOf());
+    _deviceContext->PSSetSamplers(0, 1, _linearSamplerState.GetAddressOf());
+
+    _deviceContext->Draw(3, 0);
     _swapChain->Present(1, 0);
 }

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

@@ -6,10 +6,7 @@
 #include <d3d11_2.h>
 
 #include <memory>
-
-class DeviceContext;
-class Pipeline;
-class PipelineFactory;
+#include "ShaderCollection.hpp"
 
 class TexturingApplication final : public Application
 {
@@ -30,18 +27,19 @@ class TexturingApplication 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<ID3D11Device> _device = nullptr;
+    WRL::ComPtr<ID3D11DeviceContext> _deviceContext = nullptr;
     WRL::ComPtr<IDXGIFactory2> _dxgiFactory = nullptr;
     WRL::ComPtr<IDXGISwapChain1> _swapChain = nullptr;
     WRL::ComPtr<ID3D11RenderTargetView> _renderTarget = nullptr;
+    WRL::ComPtr<ID3D11RasterizerState> _rasterState = nullptr;
     WRL::ComPtr<ID3D11Buffer> _triangleVertices = nullptr;
     WRL::ComPtr<ID3D11Debug> _debug = nullptr;
 
     WRL::ComPtr<ID3D11SamplerState> _linearSamplerState = nullptr;
     WRL::ComPtr<ID3D11ShaderResourceView> _textureSrv = nullptr;
     WRL::ComPtr<ID3D11ShaderResourceView> _fallbackTextureSrv = nullptr;
+
+    ShaderCollection _shaderCollection;
 };

src/Cpp/1-getting-started/1-3-2-Texturing/TexturingApplication.cpp

@@ -505,7 +505,7 @@ void Setting3DApplication::Render()
         &stride,
         &vertexOffset);
 
-    _shaderCollection.Set(_deviceContext.Get());
+    _shaderCollection.ApplyToContext(_deviceContext.Get());
 
     D3D11_VIEWPORT viewport = {
         0.0f,

src/Cpp/1-getting-started/1-3-2-Texturing/TexturingApplication.hpp

@@ -52,7 +52,7 @@ class ShaderCollection
     WRL::ComPtr<ID3D11VertexShader> _vertexShader = nullptr;
     WRL::ComPtr<ID3D11PixelShader> _pixelShader = nullptr;
     WRL::ComPtr<ID3D11InputLayout> _inputLayout = nullptr;
-    D3D11_PRIMITIVE_TOPOLOGY _primitiveTopology = {};*
+    D3D11_PRIMITIVE_TOPOLOGY _primitiveTopology = {};
     uint32_t _vertexSize = 0;
     static std::unordered_map<VertexType, std::vector<D3D11_INPUT_ELEMENT_DESC>> _layoutMap;
 };

src/Cpp/1-getting-started/1-3-3-SettingUp3DRendering/Setting3DApplication.cpp

@@ -429,7 +429,7 @@ void Rendering3DApplication::Render()
         0
     );
 
-    _shaderCollection.Set(_deviceContext.Get());
+    _shaderCollection.ApplyToContext(_deviceContext.Get());
 
     D3D11_VIEWPORT viewport = {
         0.0f,

src/Cpp/1-getting-started/1-3-3-SettingUp3DRendering/ShaderCollection.hpp

@@ -117,12 +117,14 @@ xcopy /Y $(ProjectDir)Assets\Textures\*.* $(OutDir)Assets\Textures\</Command>
   <ItemGroup>
     <ClCompile Include="Main.cpp" />
     <ClCompile Include="LoadingMeshesApplication.cpp" />
+    <ClCompile Include="ShaderCollection.cpp" />
     <ClCompile Include="TextureFactory.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Definitions.hpp" />
     <ClInclude Include="LoadingMeshesApplication.hpp" />
     <ClInclude Include="ResourceDescriptor.hpp" />
+    <ClInclude Include="ShaderCollection.hpp" />
     <ClInclude Include="TextureFactory.hpp" />
     <ClInclude Include="VertexType.hpp" />
   </ItemGroup>