This commit is contained in:
Branimir Karadžić 2014-10-06 19:21:08 -07:00
parent 0abdbbb02c
commit 493c964423
3 changed files with 3 additions and 4 deletions

View file

@ -43,6 +43,7 @@ function bgfxProject(_name, _kind, _defines)
configuration { "windows" } configuration { "windows" }
links { links {
"gdi32", "gdi32",
"psapi",
} }
configuration { "xcode4 or osx or ios*" } configuration { "xcode4 or osx or ios*" }

View file

@ -77,7 +77,6 @@ function exampleProject(_name)
} }
links { -- this is needed only for testing with GLES2/3 on Windows with VS2008 links { -- this is needed only for testing with GLES2/3 on Windows with VS2008
"DelayImp", "DelayImp",
"psapi",
} }
configuration { "vs201*" } configuration { "vs201*" }

View file

@ -1426,7 +1426,7 @@ RENDERDOC_IMPORT
{ {
curr = &vertexElements[jj]; curr = &vertexElements[jj];
if (0 == strcmp(curr->SemanticName, "TEXCOORD") if (0 == strcmp(curr->SemanticName, "TEXCOORD")
&& curr->SemanticIndex == index) && curr->SemanticIndex == index)
{ {
break; break;
} }
@ -2287,8 +2287,7 @@ RENDERDOC_IMPORT
else if (BGFX_CHUNK_MAGIC_VSH == magic) else if (BGFX_CHUNK_MAGIC_VSH == magic)
{ {
m_hash = bx::hashMurmur2A(code, shaderSize); m_hash = bx::hashMurmur2A(code, shaderSize);
m_code = alloc(shaderSize); m_code = copy(code, shaderSize);
memcpy(m_code->data, code, shaderSize);
DX_CHECK(s_renderD3D11->m_device->CreateVertexShader(code, shaderSize, NULL, &m_vertexShader) ); DX_CHECK(s_renderD3D11->m_device->CreateVertexShader(code, shaderSize, NULL, &m_vertexShader) );
BGFX_FATAL(NULL != m_ptr, bgfx::Fatal::InvalidShader, "Failed to create vertex shader."); BGFX_FATAL(NULL != m_ptr, bgfx::Fatal::InvalidShader, "Failed to create vertex shader.");