Ver código fonte

Changed check to fatal on failure to create shaders.

bkaradzic 13 anos atrás
pai
commit
12fe3f684e
3 arquivos alterados com 6 adições e 4 exclusões
  1. 2 0
      src/renderer_d3d11.cpp
  2. 2 2
      src/renderer_d3d9.cpp
  3. 2 2
      src/renderer_gl.h

+ 2 - 0
src/renderer_d3d11.cpp

@@ -1257,6 +1257,7 @@ namespace bgfx
 		if (_fragment)
 		{
 			DX_CHECK(s_renderCtx.m_device->CreatePixelShader(code, shaderSize, NULL, (ID3D11PixelShader**)&m_ptr) );
+			BGFX_FATAL(NULL != m_ptr, bgfx::Fatal::InvalidShader, "Failed to create fragment shader.");
 		}
 		else
 		{
@@ -1265,6 +1266,7 @@ namespace bgfx
 			memcpy(m_code->data, code, shaderSize);
 
 			DX_CHECK(s_renderCtx.m_device->CreateVertexShader(code, shaderSize, NULL, (ID3D11VertexShader**)&m_ptr) );
+			BGFX_FATAL(NULL != m_ptr, bgfx::Fatal::InvalidShader, "Failed to create vertex shader.");
 		}
 	}
 

+ 2 - 2
src/renderer_d3d9.cpp

@@ -1084,12 +1084,12 @@ namespace bgfx
 		if (_fragment)
 		{
 			DX_CHECK(s_renderCtx.m_device->CreatePixelShader(code, (IDirect3DPixelShader9**)&m_ptr) );
-			BX_CHECK(NULL != m_ptr, "Failed to create fragment shader.");
+			BGFX_FATAL(NULL != m_ptr, bgfx::Fatal::InvalidShader, "Failed to create fragment shader.");
 		}
 		else
 		{
 			DX_CHECK(s_renderCtx.m_device->CreateVertexShader(code, (IDirect3DVertexShader9**)&m_ptr) );
-			BX_CHECK(NULL != m_ptr, "Failed to create vertex shader.");
+			BGFX_FATAL(NULL != m_ptr, bgfx::Fatal::InvalidShader, "Failed to create vertex shader.");
 		}
 	}
 

+ 2 - 2
src/renderer_gl.h

@@ -357,8 +357,8 @@ namespace bgfx
 			uint32_t magic;
 			bx::read(&reader, magic);
 
-			uint32_t hash;
-			bx::read(&reader, hash);
+			uint32_t iohash;
+			bx::read(&reader, iohash);
 
 			const uint8_t* code = reader.getDataPtr();