encounter
/
dawn-cmake
mirror of https://github.com/encounter/dawn-cmake.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Code review feedback

This commit is contained in:
Ben Constable 2017-07-29 22:40:53 -07:00 committed by Corentin Wallez
parent d54a5239a6
commit ea507ddf77
6 changed files with 84 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/backend/d3d12/D3D12Backend.cpp
View File

@ -20,10 +20,10 @@
#include "backend/d3d12/CommandAllocatorManager.h" #include "backend/d3d12/CommandAllocatorManager.h"
#include "backend/d3d12/CommandBufferD3D12.h" #include "backend/d3d12/CommandBufferD3D12.h"
#include "backend/d3d12/ComputePipelineD3D12.h" #include "backend/d3d12/ComputePipelineD3D12.h"
#include "backend/d3d12/DepthStencilStateD3D12.h"
#include "backend/d3d12/DescriptorHeapAllocator.h" #include "backend/d3d12/DescriptorHeapAllocator.h"
#include "backend/d3d12/FramebufferD3D12.h" #include "backend/d3d12/FramebufferD3D12.h"
#include "backend/d3d12/InputStateD3D12.h" #include "backend/d3d12/InputStateD3D12.h"
#include "backend/d3d12/DepthStencilStateD3D12.h"
#include "backend/d3d12/PipelineLayoutD3D12.h" #include "backend/d3d12/PipelineLayoutD3D12.h"
#include "backend/d3d12/QueueD3D12.h" #include "backend/d3d12/QueueD3D12.h"
#include "backend/d3d12/RenderPipelineD3D12.h" #include "backend/d3d12/RenderPipelineD3D12.h"

6
src/backend/d3d12/DepthStencilStateD3D12.cpp
View File

@ -81,13 +81,13 @@ namespace d3d12 {
: DepthStencilStateBase(builder), device(device) { : DepthStencilStateBase(builder), device(device) {
// If you have anything other than Never, then enable depth testing // If you have anything other than Never, then enable depth testing
depthStencilDescriptor.DepthEnable = TRUE; // (GetDepth().compareFunction == nxt::CompareFunction::Never) ? FALSE : TRUE; depthStencilDescriptor.DepthEnable = TRUE;
depthStencilDescriptor.DepthWriteMask = GetDepth().depthWriteEnabled ? D3D12_DEPTH_WRITE_MASK_ALL : D3D12_DEPTH_WRITE_MASK_ZERO; depthStencilDescriptor.DepthWriteMask = GetDepth().depthWriteEnabled ? D3D12_DEPTH_WRITE_MASK_ALL : D3D12_DEPTH_WRITE_MASK_ZERO;
depthStencilDescriptor.DepthFunc = ComparisonFunc(GetDepth().compareFunction); depthStencilDescriptor.DepthFunc = ComparisonFunc(GetDepth().compareFunction);
depthStencilDescriptor.StencilEnable = StencilTestEnabled() ? TRUE : FALSE; depthStencilDescriptor.StencilEnable = StencilTestEnabled() ? TRUE : FALSE;
depthStencilDescriptor.StencilReadMask = (UINT8)GetStencil().readMask; depthStencilDescriptor.StencilReadMask = static_cast<UINT8>(GetStencil().readMask);
depthStencilDescriptor.StencilWriteMask = (UINT8)GetStencil().writeMask; depthStencilDescriptor.StencilWriteMask = static_cast<UINT8>(GetStencil().writeMask);
depthStencilDescriptor.FrontFace = StencilOpDesc(GetStencil().front); depthStencilDescriptor.FrontFace = StencilOpDesc(GetStencil().front);
depthStencilDescriptor.BackFace = StencilOpDesc(GetStencil().back); depthStencilDescriptor.BackFace = StencilOpDesc(GetStencil().back);

2
src/backend/d3d12/GeneratedCodeIncludes.h
View File

@ -18,9 +18,9 @@
#include "backend/d3d12/BufferD3D12.h" #include "backend/d3d12/BufferD3D12.h"
#include "backend/d3d12/CommandBufferD3D12.h" #include "backend/d3d12/CommandBufferD3D12.h"
#include "backend/d3d12/ComputePipelineD3D12.h" #include "backend/d3d12/ComputePipelineD3D12.h"
#include "backend/d3d12/DepthStencilStateD3D12.h"
#include "backend/d3d12/FramebufferD3D12.h" #include "backend/d3d12/FramebufferD3D12.h"
#include "backend/d3d12/InputStateD3D12.h" #include "backend/d3d12/InputStateD3D12.h"
#include "backend/d3d12/DepthStencilStateD3D12.h"
#include "backend/d3d12/PipelineLayoutD3D12.h" #include "backend/d3d12/PipelineLayoutD3D12.h"
#include "backend/d3d12/QueueD3D12.h" #include "backend/d3d12/QueueD3D12.h"
#include "backend/d3d12/RenderPipelineD3D12.h" #include "backend/d3d12/RenderPipelineD3D12.h"

2
src/backend/d3d12/RenderPipelineD3D12.cpp
View File

@ -15,8 +15,8 @@
#include "backend/d3d12/RenderPipelineD3D12.h" #include "backend/d3d12/RenderPipelineD3D12.h"
#include "backend/d3d12/D3D12Backend.h" #include "backend/d3d12/D3D12Backend.h"
#include "backend/d3d12/InputStateD3D12.h"
#include "backend/d3d12/DepthStencilStateD3D12.h" #include "backend/d3d12/DepthStencilStateD3D12.h"
#include "backend/d3d12/InputStateD3D12.h"
#include "backend/d3d12/ShaderModuleD3D12.h" #include "backend/d3d12/ShaderModuleD3D12.h"
#include "backend/d3d12/PipelineLayoutD3D12.h" #include "backend/d3d12/PipelineLayoutD3D12.h"
#include "common/Assert.h" #include "common/Assert.h"

2
src/tests/end2end/DepthStencilStateTests.cpp
View File

@ -522,4 +522,4 @@ TEST_P(DepthStencilStateTest, StencilDepthPass) {
2); // Replace the stencil on stencil pass, depth pass, so it should be 2 2); // Replace the stencil on stencil pass, depth pass, so it should be 2
} }
NXT_INSTANTIATE_TEST(DepthStencilStateTest, MetalBackend, OpenGLBackend, D3D12Backend) NXT_INSTANTIATE_TEST(DepthStencilStateTest, D3D12Backend, MetalBackend, OpenGLBackend)