mirrors/bgfx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:bkaradzic/bgfx

Browse Source
This commit is contained in:
Branimir Karadžić 2017-01-15 16:22:54 -08:00
commit fd6ab494ff
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/renderer_d3d9.cpp
View File

@ -2982,11 +2982,11 @@ namespace bgfx { namespace d3d9
switch (m_textureFormat)
{
case TextureFormat::RGB5A1:
imageConvert(bits, 16, packBgr5a1, mip.m_data, unpackRgb5a1, size);
imageConvert(bits, 16, bx::packBgr5a1, mip.m_data, bx::unpackRgb5a1, size);
break;
case TextureFormat::RGBA4:
imageConvert(bits, 16, packBgra4, mip.m_data, unpackRgba4, size);
imageConvert(bits, 16, bx::packBgra4, mip.m_data, bx::unpackRgba4, size);
break;
default:
@ -3044,11 +3044,11 @@ namespace bgfx { namespace d3d9
switch (m_textureFormat)
{
case TextureFormat::RGB5A1:
imageConvert(dst, 16, packBgr5a1, src, unpackRgb5a1, rectpitch);
imageConvert(dst, 16, bx::packBgr5a1, src, bx::unpackRgb5a1, rectpitch);
break;
case TextureFormat::RGBA4:
imageConvert(dst, 16, packBgra4, src, unpackRgba4, rectpitch);
imageConvert(dst, 16, bx::packBgra4, src, bx::unpackRgba4, rectpitch);
break;
default:

2
tools/shaderc/shaderc.cpp
View File

@ -710,7 +710,7 @@ namespace bgfx
"\n"
"Options:\n"
" -f <file path> Input file path.\n"
" -i <include path> Include path (for multiple paths use semicolon).\n"
" -i <include path> Include path (for multiple paths use use -i multiple times).\n"
" -o <file path> Output file path.\n"
" --bin2c <file path> Generate C header file.\n"
" --depends Generate makefile style depends file.\n"