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

Fixed windows build.

Browse Source
This commit is contained in:
Branimir Karadžić 2021-10-25 19:10:41 -07:00
parent 948d137dfd
commit 2cfba5474d
3 changed files with 66 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/renderer_d3d11.cpp
View File

@ -540,11 +540,13 @@ namespace bgfx { namespace d3d11
{
uint8_t temp[28];
bx::ErrorAssert err;
bx::StaticMemoryBlockWriter writer(&temp, sizeof(temp) );
bx::write(&writer, "INTCEXTNCAPSFUNC", 16);
bx::write(&writer, kIntelExtensionInterfaceVersion);
bx::write(&writer, UINT32_C(0) );
bx::write(&writer, UINT32_C(0) );
bx::write(&writer, "INTCEXTNCAPSFUNC", 16, &err);
bx::write(&writer, kIntelExtensionInterfaceVersion, &err);
bx::write(&writer, uint32_t(0), &err);
bx::write(&writer, uint32_t(0), &err);
if (SUCCEEDED(setIntelExtension(_device, temp, sizeof(temp) ) ) )
{
@ -552,10 +554,10 @@ namespace bgfx { namespace d3d11
bx::skip(&reader, 16);
uint32_t version;
bx::read(&reader, version);
bx::read(&reader, version, &err);
uint32_t driverVersion;
bx::read(&reader, driverVersion);
bx::read(&reader, driverVersion, &err);
return version <= driverVersion;
}
@ -1850,7 +1852,7 @@ namespace bgfx { namespace d3d11
bx::StaticMemoryBlockWriter writer(mem->data, mem->size);
uint32_t magic = BGFX_CHUNK_MAGIC_TEX;
bx::write(&writer, magic);
bx::write(&writer, magic, bx::ErrorAssert{});
TextureCreate tc;
tc.m_width = _width;
@ -1861,7 +1863,7 @@ namespace bgfx { namespace d3d11
tc.m_format = TextureFormat::Enum(texture.m_requestedFormat);
tc.m_cubeMap = false;
tc.m_mem = NULL;
bx::write(&writer, tc);
bx::write(&writer, tc, bx::ErrorAssert{});
texture.destroy();
texture.create(mem, texture.m_flags, 0);
@ -4078,13 +4080,15 @@ namespace bgfx { namespace d3d11
{
bx::MemoryReader reader(_mem->data, _mem->size);
bx::ErrorAssert err;
uint32_t magic;
bx::read(&reader, magic);
bx::read(&reader, magic, &err);
const bool fragment = isShaderType(magic, 'F');
uint32_t hashIn;
bx::read(&reader, hashIn);
bx::read(&reader, hashIn, &err);
uint32_t hashOut;
@ -4094,11 +4098,11 @@ namespace bgfx { namespace d3d11
}
else
{
bx::read(&reader, hashOut);
bx::read(&reader, hashOut, &err);
}
uint16_t count;
bx::read(&reader, count);
bx::read(&reader, count, &err);
m_numPredefined = 0;
m_numUniforms = count;
@ -4115,34 +4119,34 @@ namespace bgfx { namespace d3d11
for (uint32_t ii = 0; ii < count; ++ii)
{
uint8_t nameSize = 0;
bx::read(&reader, nameSize);
bx::read(&reader, nameSize, &err);
char name[256] = { '\0' };
bx::read(&reader, &name, nameSize);
bx::read(&reader, &name, nameSize, &err);
name[nameSize] = '\0';
uint8_t type = 0;
bx::read(&reader, type);
bx::read(&reader, type, &err);
uint8_t num = 0;
bx::read(&reader, num);
bx::read(&reader, num, &err);
uint16_t regIndex = 0;
bx::read(&reader, regIndex);
bx::read(&reader, regIndex, &err);
uint16_t regCount = 0;
bx::read(&reader, regCount);
bx::read(&reader, regCount, &err);
if (!isShaderVerLess(magic, 8) )
{
uint16_t texInfo = 0;
bx::read(&reader, texInfo);
bx::read(&reader, texInfo, &err);
}
if (!isShaderVerLess(magic, 10) )
{
uint16_t texFormat = 0;
bx::read(&reader, texFormat);
bx::read(&reader, texFormat, &err);
}
const char* kind = "invalid";
@ -4195,7 +4199,7 @@ namespace bgfx { namespace d3d11
}
uint32_t shaderSize;
bx::read(&reader, shaderSize);
bx::read(&reader, shaderSize, &err);
const void* code = reader.getDataPtr();
bx::skip(&reader, shaderSize+1);
@ -4207,8 +4211,7 @@ namespace bgfx { namespace d3d11
bx::MemoryReader rd(code, shaderSize);
DxbcContext dxbc;
bx::Error err;
read(&rd, dxbc, &err);
read(&rd, dxbc, bx::ErrorAssert{});
bool patchShader = !dxbc.shader.aon9;
if (patchShader)
@ -4248,14 +4251,14 @@ namespace bgfx { namespace d3d11
}
uint8_t numAttrs = 0;
bx::read(&reader, numAttrs);
bx::read(&reader, numAttrs, bx::ErrorAssert{});
bx::memSet(m_attrMask, 0, sizeof(m_attrMask) );
for (uint32_t ii = 0; ii < numAttrs; ++ii)
{
uint16_t id;
bx::read(&reader, id);
bx::read(&reader, id, bx::ErrorAssert{});
Attrib::Enum attr = idToAttrib(id);
@ -4266,7 +4269,7 @@ namespace bgfx { namespace d3d11
}
uint16_t size;
bx::read(&reader, size);
bx::read(&reader, size, bx::ErrorAssert{});
if (0 < size)
{

38
src/renderer_d3d12.cpp
View File

@ -1718,7 +1718,7 @@ namespace bgfx { namespace d3d12
bx::StaticMemoryBlockWriter writer(mem->data, mem->size);
uint32_t magic = BGFX_CHUNK_MAGIC_TEX;
bx::write(&writer, magic);
bx::write(&writer, magic, bx::ErrorAssert{});
TextureCreate tc;
tc.m_width = _width;
@ -1729,7 +1729,7 @@ namespace bgfx { namespace d3d12
tc.m_format = TextureFormat::Enum(texture.m_requestedFormat);
tc.m_cubeMap = false;
tc.m_mem = NULL;
bx::write(&writer, tc);
bx::write(&writer, tc, bx::ErrorAssert{});
texture.destroy();
texture.create(mem, texture.m_flags, 0);
@ -4501,13 +4501,15 @@ namespace bgfx { namespace d3d12
{
bx::MemoryReader reader(_mem->data, _mem->size);
bx::ErrorAssert err;
uint32_t magic;
bx::read(&reader, magic);
bx::read(&reader, magic, &err);
const bool fragment = isShaderType(magic, 'F');
uint32_t hashIn;
bx::read(&reader, hashIn);
bx::read(&reader, hashIn, &err);
uint32_t hashOut;
@ -4517,11 +4519,11 @@ namespace bgfx { namespace d3d12
}
else
{
bx::read(&reader, hashOut);
bx::read(&reader, hashOut, &err);
}
uint16_t count;
bx::read(&reader, count);
bx::read(&reader, count, &err);
m_numPredefined = 0;
m_numUniforms = count;
@ -4538,34 +4540,34 @@ namespace bgfx { namespace d3d12
for (uint32_t ii = 0; ii < count; ++ii)
{
uint8_t nameSize = 0;
bx::read(&reader, nameSize);
bx::read(&reader, nameSize, &err);
char name[256] = {};
bx::read(&reader, &name, nameSize);
bx::read(&reader, &name, nameSize, &err);
name[nameSize] = '\0';
uint8_t type = 0;
bx::read(&reader, type);
bx::read(&reader, type, &err);
uint8_t num = 0;
bx::read(&reader, num);
bx::read(&reader, num, &err);
uint16_t regIndex = 0;
bx::read(&reader, regIndex);
bx::read(&reader, regIndex, &err);
uint16_t regCount = 0;
bx::read(&reader, regCount);
bx::read(&reader, regCount, &err);
if (!isShaderVerLess(magic, 8) )
{
uint16_t texInfo = 0;
bx::read(&reader, texInfo);
bx::read(&reader, texInfo, &err);
}
if (!isShaderVerLess(magic, 10) )
{
uint16_t texFormat = 0;
bx::read(&reader, texFormat);
bx::read(&reader, texFormat, &err);
}
const char* kind = "invalid";
@ -4618,7 +4620,7 @@ namespace bgfx { namespace d3d12
}
uint32_t shaderSize;
bx::read(&reader, shaderSize);
bx::read(&reader, shaderSize, &err);
const void* code = reader.getDataPtr();
bx::skip(&reader, shaderSize+1);
@ -4626,14 +4628,14 @@ namespace bgfx { namespace d3d12
m_code = copy(code, shaderSize);
uint8_t numAttrs = 0;
bx::read(&reader, numAttrs);
bx::read(&reader, numAttrs, &err);
bx::memSet(m_attrMask, 0, sizeof(m_attrMask) );
for (uint32_t ii = 0; ii < numAttrs; ++ii)
{
uint16_t id;
bx::read(&reader, id);
bx::read(&reader, id, &err);
Attrib::Enum attr = idToAttrib(id);
@ -4652,7 +4654,7 @@ namespace bgfx { namespace d3d12
murmur.add(m_attrMask, numAttrs);
m_hash = murmur.end();
bx::read(&reader, m_size);
bx::read(&reader, m_size, &err);
}
void* TextureD3D12::create(const Memory* _mem, uint64_t _flags, uint8_t _skip)

32
src/renderer_d3d9.cpp
View File

@ -1134,7 +1134,7 @@ namespace bgfx { namespace d3d9
bx::StaticMemoryBlockWriter writer(mem->data, mem->size);
uint32_t magic = BGFX_CHUNK_MAGIC_TEX;
bx::write(&writer, magic);
bx::write(&writer, magic, bx::ErrorAssert{});
TextureCreate tc;
tc.m_width = _width;
@ -1145,7 +1145,7 @@ namespace bgfx { namespace d3d9
tc.m_format = TextureFormat::Enum(texture.m_requestedFormat);
tc.m_cubeMap = false;
tc.m_mem = NULL;
bx::write(&writer, tc);
bx::write(&writer, tc, bx::ErrorAssert{});
texture.destroy(true);
texture.create(mem, texture.m_flags, 0);
@ -2397,13 +2397,15 @@ namespace bgfx { namespace d3d9
{
bx::MemoryReader reader(_mem->data, _mem->size);
bx::ErrorAssert err;
uint32_t magic;
bx::read(&reader, magic);
bx::read(&reader, magic, &err);
const bool fragment = isShaderType(magic, 'F');
uint32_t hashIn;
bx::read(&reader, hashIn);
bx::read(&reader, hashIn, &err);
uint32_t hashOut;
@ -2413,11 +2415,11 @@ namespace bgfx { namespace d3d9
}
else
{
bx::read(&reader, hashOut);
bx::read(&reader, hashOut, &err);
}
uint16_t count;
bx::read(&reader, count);
bx::read(&reader, count, &err);
m_numPredefined = 0;
@ -2430,34 +2432,34 @@ namespace bgfx { namespace d3d9
for (uint32_t ii = 0; ii < count; ++ii)
{
uint8_t nameSize = 0;
bx::read(&reader, nameSize);
bx::read(&reader, nameSize, &err);
char name[256] = {};
bx::read(&reader, &name, nameSize);
bx::read(&reader, &name, nameSize, &err);
name[nameSize] = '\0';
uint8_t type = 0;
bx::read(&reader, type);
bx::read(&reader, type, &err);
uint8_t num = 0;
bx::read(&reader, num);
bx::read(&reader, num, &err);
uint16_t regIndex = 0;
bx::read(&reader, regIndex);
bx::read(&reader, regIndex, &err);
uint16_t regCount = 0;
bx::read(&reader, regCount);
bx::read(&reader, regCount, &err);
if (!isShaderVerLess(magic, 8) )
{
uint16_t texInfo = 0;
bx::read(&reader, texInfo);
bx::read(&reader, texInfo, &err);
}
if (!isShaderVerLess(magic, 10) )
{
uint16_t texFormat = 0;
bx::read(&reader, texFormat);
bx::read(&reader, texFormat, &err);
}
const char* kind = "invalid";
@ -2510,7 +2512,7 @@ namespace bgfx { namespace d3d9
}
uint32_t shaderSize;
bx::read(&reader, shaderSize);
bx::read(&reader, shaderSize, &err);
const DWORD* code = (const DWORD*)reader.getDataPtr();