Mirrors/bgfx
1
0
Fork 0
mirror of https://github.com/bkaradzic/bgfx.git synced 2026-02-21 22:33:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make shaderc output independent of backend enums (#2411)

Browse Source 
* Fix typo in SPIR-V id

* Use backend-agnostic shaderc output

...as opposed to directly storing and comparing against Vulkan and WebGPU enums. This is backwards-compatible with existing code and shaders.

* Remove comments and Undefined value
This commit is contained in:
pezcode
2021-02-28 21:38:12 +01:00
committed by GitHub
parent 39cdaace39
commit 302c978b1d
8 changed files with 216 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/renderer_vk.cpp
View File

@@ -5067,13 +5067,20 @@ VK_DESTROY
uint16_t regCount;
bx::read(&reader, regCount);
if (!isShaderVerLess(magic, 8) )
const bool hasTexData = !isShaderVerLess(magic, 8);
uint8_t texComponent = 0;
uint8_t texDimension = 0;
if (hasTexData)
{
uint16_t texInfo = 0;
bx::read(&reader, texInfo);
bx::read(&reader, texComponent);
bx::read(&reader, texDimension);
}
const char* kind = "invalid";
BX_UNUSED(num);
BX_UNUSED(texComponent);
if (UINT16_MAX != regIndex)
{
PredefinedUniform::Enum predefined = nameToPredefinedUniformEnum(name);
@@ -5088,7 +5095,7 @@ VK_DESTROY
else if (UniformType::End == (~kUniformMask & type) )
{
// regCount is used for descriptor type
const bool isBuffer = regCount == VK_DESCRIPTOR_TYPE_STORAGE_BUFFER;
const bool isBuffer = idToDescriptorType(regCount) == DescriptorType::StorageBuffer;
const uint16_t stage = regIndex - (isBuffer ? 16 : 32) - (fragment ? 48 : 0); // regIndex is used for buffer binding index
m_bindInfo[stage].type = isBuffer ? BindType::Buffer : BindType::Image;
@@ -5129,13 +5136,14 @@ VK_DESTROY
}
}
BX_TRACE("\t%s: %s (%s), num %2d, r.index %3d, r.count %2d"
BX_TRACE("\t%s: %s (%s), r.index %3d, r.count %2d, r.texComponent %1d, r.texDimension %1d"
, kind
, name
, getUniformTypeName(UniformType::Enum(type&~kUniformMask) )
, num
, regIndex
, regCount
, texComponent
, texDimension
);
BX_UNUSED(kind);
}