Branimir Karadžić 7 years ago
parent
commit
f2e19da28a
2 changed files with 4 additions and 5 deletions
  1. 2 2
      src/renderer_d3d11.cpp
  2. 2 3
      tools/shaderc/shaderc.cpp

+ 2 - 2
src/renderer_d3d11.cpp

@@ -983,8 +983,7 @@ namespace bgfx { namespace d3d11
 				else
 				else
 				{
 				{
 					IUnknown* device = m_device;
 					IUnknown* device = m_device;
-					setGraphicsDebuggerPresent(3 != getRefCount(device) );
-					DX_RELEASE(device, 2);
+					setGraphicsDebuggerPresent(2 != getRefCount(device) );
 				}
 				}
 
 
 				if (BGFX_PCI_ID_NVIDIA != m_dxgi.m_adapterDesc.VendorId)
 				if (BGFX_PCI_ID_NVIDIA != m_dxgi.m_adapterDesc.VendorId)
@@ -1598,6 +1597,7 @@ namespace bgfx { namespace d3d11
 			DX_RELEASE(m_annotation, 1);
 			DX_RELEASE(m_annotation, 1);
 			DX_RELEASE(m_swapChain, 0);
 			DX_RELEASE(m_swapChain, 0);
 			DX_RELEASE(m_deviceCtx, 0);
 			DX_RELEASE(m_deviceCtx, 0);
+			DX_RELEASE(m_device, 0);
 
 
 			m_dxgi.shutdown();
 			m_dxgi.shutdown();
 
 

+ 2 - 3
tools/shaderc/shaderc.cpp

@@ -18,7 +18,7 @@ extern "C"
 #define BGFX_CHUNK_MAGIC_VSH BX_MAKEFOURCC('V', 'S', 'H', 0x5)
 #define BGFX_CHUNK_MAGIC_VSH BX_MAKEFOURCC('V', 'S', 'H', 0x5)
 
 
 #define BGFX_SHADERC_VERSION_MAJOR 1
 #define BGFX_SHADERC_VERSION_MAJOR 1
-#define BGFX_SHADERC_VERSION_MINOR 8
+#define BGFX_SHADERC_VERSION_MINOR 9
 
 
 namespace bgfx
 namespace bgfx
 {
 {
@@ -2327,8 +2327,7 @@ namespace bgfx
 				return bx::kExitFailure;
 				return bx::kExitFailure;
 			}
 			}
 
 
-			if ( compileShader(attribdef.getData(), data, size, options, writer) )
-				compiled = true;
+			compiled = compileShader(attribdef.getData(), data, size, options, writer);
 
 
 			bx::close(writer);
 			bx::close(writer);
 			delete writer;
 			delete writer;