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

Remove DepthTestEnabled() and fix depth writes for depth function Always

This commit is contained in:
Austin Eng 2017-07-21 18:35:56 -04:00 committed by Austin Eng
parent cc8d2d529d
commit ccf1fa2330
4 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/backend/DepthStencilState.cpp
View File

@ -24,10 +24,6 @@ namespace backend {
: depthInfo(builder->depthInfo), stencilInfo(builder->stencilInfo) { : depthInfo(builder->depthInfo), stencilInfo(builder->stencilInfo) {
} }
bool DepthStencilStateBase::DepthTestEnabled() const {
return depthInfo.compareFunction != nxt::CompareFunction::Always;
}
bool DepthStencilStateBase::StencilTestEnabled() const { bool DepthStencilStateBase::StencilTestEnabled() const {
return stencilInfo.back.compareFunction != nxt::CompareFunction::Always || return stencilInfo.back.compareFunction != nxt::CompareFunction::Always ||
stencilInfo.back.stencilFail != nxt::StencilOperation::Keep || stencilInfo.back.stencilFail != nxt::StencilOperation::Keep ||

1
src/backend/DepthStencilState.h
View File

@ -47,7 +47,6 @@ namespace backend {
uint32_t writeMask = 0xff; uint32_t writeMask = 0xff;
}; };
bool DepthTestEnabled() const;
bool StencilTestEnabled() const; bool StencilTestEnabled() const;
const DepthInfo& GetDepth() const; const DepthInfo& GetDepth() const;
const StencilInfo& GetStencil() const; const StencilInfo& GetStencil() const;

9
src/backend/metal/DepthStencilStateMTL.mm
View File

@ -67,14 +67,11 @@ namespace metal {
: DepthStencilStateBase(builder) { : DepthStencilStateBase(builder) {
MTLDepthStencilDescriptor* mtlDepthStencilDescriptor = [MTLDepthStencilDescriptor new]; MTLDepthStencilDescriptor* mtlDepthStencilDescriptor = [MTLDepthStencilDescriptor new];
if (DepthTestEnabled()) { auto& depth = GetDepth();
auto& depth = GetDepth(); mtlDepthStencilDescriptor.depthCompareFunction = MetalDepthStencilCompareFunction(depth.compareFunction);
mtlDepthStencilDescriptor.depthCompareFunction = MetalDepthStencilCompareFunction(depth.compareFunction); mtlDepthStencilDescriptor.depthWriteEnabled = depth.depthWriteEnabled;
mtlDepthStencilDescriptor.depthWriteEnabled = depth.depthWriteEnabled;
}
auto& stencil = GetStencil(); auto& stencil = GetStencil();
if (StencilTestEnabled()) { if (StencilTestEnabled()) {
MTLStencilDescriptor* backFaceStencil = [MTLStencilDescriptor new]; MTLStencilDescriptor* backFaceStencil = [MTLStencilDescriptor new];
MTLStencilDescriptor* frontFaceStencil = [MTLStencilDescriptor new]; MTLStencilDescriptor* frontFaceStencil = [MTLStencilDescriptor new];

13
src/backend/opengl/DepthStencilStateGL.cpp
View File

@ -74,14 +74,15 @@ namespace opengl {
} }
void DepthStencilState::ApplyNow(PersistentPipelineState &persistentPipelineState) const { void DepthStencilState::ApplyNow(PersistentPipelineState &persistentPipelineState) const {
if (DepthTestEnabled()) {
glEnable(GL_DEPTH_TEST);
} else {
glDisable(GL_DEPTH_TEST);
}
auto& depthInfo = GetDepth(); auto& depthInfo = GetDepth();
// Depth writes only occur if depth is enabled
if (depthInfo.compareFunction == nxt::CompareFunction::Always && !depthInfo.depthWriteEnabled) {
glDisable(GL_DEPTH_TEST);
} else {
glEnable(GL_DEPTH_TEST);
}
if (depthInfo.depthWriteEnabled) { if (depthInfo.depthWriteEnabled) {
glDepthMask(GL_TRUE); glDepthMask(GL_TRUE);
} else { } else {