scratchfoundation/bgfx
1
0
Fork 0
mirror of https://github.com/scratchfoundation/bgfx.git synced 2024-11-28 18:45:54 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Cleanup

Browse source
This commit is contained in:
Mike Popoloski 2015-04-10 22:01:42 -04:00
parent 6e53a5e229
commit f919f7811f
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
scripts/shaderc.lua
View file

@ -58,7 +58,6 @@ project "shaderc"
configuration { "windows" } configuration { "windows" }
links { links {
"d3dx9",
"d3dcompiler", "d3dcompiler",
"dxguid", "dxguid",
} }

4
tools/shaderc/shaderc_d3d11.cpp
View file

@ -168,7 +168,7 @@ bool getReflectionDataDx9(ID3DBlob* _code, UniformArray& _uniforms)
while (ptr < end && *ptr != D3DSIO_END) while (ptr < end && *ptr != D3DSIO_END)
{ {
uint32_t cur = *ptr++; uint32_t cur = *ptr++;
if (cur & D3DSI_OPCODE_MASK != D3DSIO_COMMENT) if ((cur & D3DSI_OPCODE_MASK) != D3DSIO_COMMENT)
continue; continue;
// try to find CTAB comment block // try to find CTAB comment block
@ -236,7 +236,7 @@ bool getReflectionDataDx9(ID3DBlob* _code, UniformArray& _uniforms)
Uniform un; Uniform un;
un.name = '$' == name[0] ? name + 1 : name; un.name = '$' == name[0] ? name + 1 : name;
un.type = type; un.type = type;
un.num = ctType.Elements; un.num = (uint8_t)ctType.Elements;
un.regIndex = ctInfo.RegisterIndex; un.regIndex = ctInfo.RegisterIndex;
un.regCount = ctInfo.RegisterCount; un.regCount = ctInfo.RegisterCount;
_uniforms.push_back(un); _uniforms.push_back(un);