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

Cleanup.

Browse Source
This commit is contained in:
Бранимир Караџић 2019-08-13 19:22:46 -07:00
parent 4986981378
commit 981ea06a97
2 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/renderer_vk.cpp
View File

@ -3210,7 +3210,7 @@ VK_IMPORT_DEVICE
} }
resolveAr[ii].attachment = VK_ATTACHMENT_UNUSED; resolveAr[ii].attachment = VK_ATTACHMENT_UNUSED;
resolveAr[ii].layout = ad[ii].initialLayout; // TODO: should know hot to set it appropriately resolveAr[ii].layout = ad[ii].initialLayout;
} }
VkSubpassDescription sd[1]; VkSubpassDescription sd[1];
@ -4376,9 +4376,9 @@ VK_DESTROY
for (uint32_t ii = 0; ii < BGFX_CONFIG_MAX_TEXTURE_SAMPLERS; ++ii) for (uint32_t ii = 0; ii < BGFX_CONFIG_MAX_TEXTURE_SAMPLERS; ++ii)
{ {
m_bindInfo[ii].uniformHandle = {kInvalidHandle}; m_bindInfo[ii].uniformHandle = BGFX_INVALID_HANDLE;
m_bindInfo[ii].type = UNKNOWN; m_bindInfo[ii].type = BindType::Count;
m_bindInfo[ii].binding = 0; m_bindInfo[ii].binding = 0;
m_bindInfo[ii].samplerBinding = 0; m_bindInfo[ii].samplerBinding = 0;
} }
@ -4418,10 +4418,10 @@ VK_DESTROY
} }
else if (UniformType::End == (~BGFX_UNIFORM_MASK & type)) else if (UniformType::End == (~BGFX_UNIFORM_MASK & type))
{ {
m_bindInfo[num].uniformHandle = {0}; m_bindInfo[num].uniformHandle = { 0 };
m_bindInfo[num].type = STORAGE; m_bindInfo[num].type = BindType::Storage;
m_bindInfo[num].binding = regCount; // regCount is used for buffer binding index m_bindInfo[num].binding = regCount; // regCount is used for buffer binding index
m_bindInfo[num].samplerBinding = regIndex; // regIndex is used for descriptor type m_bindInfo[num].samplerBinding = regIndex; // regIndex is used for descriptor type
kind = "storage"; kind = "storage";
} }
@ -4430,10 +4430,10 @@ VK_DESTROY
const UniformRegInfo* info = s_renderVK->m_uniformReg.find(name); const UniformRegInfo* info = s_renderVK->m_uniformReg.find(name);
BX_CHECK(NULL != info, "User defined uniform '%s' is not found, it won't be set.", name); BX_CHECK(NULL != info, "User defined uniform '%s' is not found, it won't be set.", name);
m_bindInfo[num].uniformHandle = info->m_handle; m_bindInfo[num].uniformHandle = info->m_handle;
m_bindInfo[num].type = SAMPLER; m_bindInfo[num].type = BindType::Sampler;
m_bindInfo[num].binding = regIndex; // regIndex is used for image binding index m_bindInfo[num].binding = regIndex; // regIndex is used for image binding index
m_bindInfo[num].samplerBinding = regCount; // regCount is used for sampler binding index m_bindInfo[num].samplerBinding = regCount; // regCount is used for sampler binding index
kind = "sampler"; kind = "sampler";
} }
@ -4546,7 +4546,7 @@ VK_DESTROY
{ {
switch (m_bindInfo[ii].type) switch (m_bindInfo[ii].type)
{ {
case STORAGE: case BindType::Storage:
m_bindings[bidx].stageFlags = VK_SHADER_STAGE_ALL; m_bindings[bidx].stageFlags = VK_SHADER_STAGE_ALL;
m_bindings[bidx].descriptorType = (VkDescriptorType)m_bindInfo[ii].samplerBinding; m_bindings[bidx].descriptorType = (VkDescriptorType)m_bindInfo[ii].samplerBinding;
m_bindings[bidx].binding = m_bindInfo[ii].binding; m_bindings[bidx].binding = m_bindInfo[ii].binding;
@ -4555,7 +4555,7 @@ VK_DESTROY
bidx++; bidx++;
break; break;
case SAMPLER: case BindType::Sampler:
m_bindings[bidx].stageFlags = VK_SHADER_STAGE_ALL; m_bindings[bidx].stageFlags = VK_SHADER_STAGE_ALL;
m_bindings[bidx].descriptorType = VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE; m_bindings[bidx].descriptorType = VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE;
m_bindings[bidx].binding = m_bindInfo[ii].binding; m_bindings[bidx].binding = m_bindInfo[ii].binding;

16
src/renderer_vk.h
View File

@ -414,19 +414,25 @@ VK_DESTROY
uint8_t m_numPredefined; uint8_t m_numPredefined;
uint8_t m_numAttrs; uint8_t m_numAttrs;
enum BindType struct BindType
{ {
UNKNOWN, enum Enum
STORAGE, {
SAMPLER, Storage,
Sampler,
Count
};
}; };
struct BindInfo struct BindInfo
{ {
UniformHandle uniformHandle; UniformHandle uniformHandle;
BindType type; BindType::Enum type;
uint32_t binding; uint32_t binding;
uint32_t samplerBinding; uint32_t samplerBinding;
}; };
BindInfo m_bindInfo[BGFX_CONFIG_MAX_TEXTURE_SAMPLERS]; BindInfo m_bindInfo[BGFX_CONFIG_MAX_TEXTURE_SAMPLERS];
uint32_t m_uniformBinding; uint32_t m_uniformBinding;
uint16_t m_numBindings; uint16_t m_numBindings;