AxioDL/boo
2
0
Fork 0
mirror of https://github.com/AxioDL/boo.git synced 2025-12-19 01:46:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

D3D sync

Browse Source
This commit is contained in:
Jack Andersen
2016-07-31 18:32:27 -10:00
parent 21548bada8
commit 29364a8024
3 changed files with 38 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/graphicsdev/D3D12.cpp
View File

@@ -648,7 +648,7 @@ class D3D12ShaderPipeline : public IShaderPipeline
if (!backfaceCulling)
desc.RasterizerState.CullMode = D3D12_CULL_MODE_NONE;
desc.DepthStencilState = CD3DX12_DEPTH_STENCIL_DESC(D3D12_DEFAULT);
desc.DepthStencilState.DepthFunc = D3D12_COMPARISON_FUNC_GREATER;
desc.DepthStencilState.DepthFunc = D3D12_COMPARISON_FUNC_GREATER_EQUAL;
if (!depthTest)
desc.DepthStencilState.DepthEnable = false;
if (!depthWrite)
@@ -935,10 +935,6 @@ struct D3D12ShaderDataBinding : IShaderDataBinding
}
for (size_t i=0 ; i<texCount ; ++i)
{
#ifndef NDEBUG
if (!texs[i])
Log.report(logvisor::Fatal, "null texture %d provided to newShaderDataBinding", int(i));
#endif
m_texs[i] = texs[i];
}
}
@@ -996,7 +992,7 @@ struct D3D12ShaderDataBinding : IShaderDataBinding
}
for (size_t i=0 ; i<MAX_TEXTURE_COUNT ; ++i)
{
if (i<m_texCount)
if (i<m_texCount && m_texs[i])
{
D3D12_SHADER_RESOURCE_VIEW_DESC srvDesc;
ID3D12Resource* res = GetTextureGPUResource(m_texs[i], b, srvDesc);
@@ -1602,6 +1598,9 @@ public:
{
ComPtr<ID3DBlob> errBlob;
//printf("%s\n", vertSource);
//printf("%s\n", fragSource);
if (!vertBlobOut)
{
if (FAILED(D3DCompilePROC(vertSource, strlen(vertSource), "HECL Vert Source", nullptr, nullptr, "main",