fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-09 06:48:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

gfxstream: fix log levels in descriptor handling

Browse source 
... that potentially were accidentally promoted to info logs in
aosp/3252215 which affects common hot path.

Fixes: 6f0fff4634 ("gfxstream: guest: fully mesa-ify vulkan_enc")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31288>
This commit is contained in:
Jason Macnak 2024-09-20 10:07:49 -07:00 • committed by Marge Bot
parent 58d5847fe3
commit 6b83d49879
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/gfxstream/guest/vulkan_enc/DescriptorSetVirtualization.cpp
View file

@ -329,7 +329,7 @@ static bool isBindingFeasibleForAlloc(
uint32_t availDescriptorCount = countInfo.descriptorCount - countInfo.used;
if (availDescriptorCount < binding.descriptorCount) {
mesa_logi(
mesa_logd(
"%s: Ran out of descriptors of type 0x%x. "
"Wanted %u from layout but "
"we only have %u free (total in pool: %u)\n",
@ -346,7 +346,7 @@ static bool isBindingFeasibleForFree(
const VkDescriptorSetLayoutBinding& binding) {
if (countInfo.type != binding.descriptorType) return false;
if (countInfo.used < binding.descriptorCount) {
mesa_logi(
mesa_logd(
"%s: Was a descriptor set double freed? "
"Ran out of descriptors of type 0x%x. "
"Wanted to free %u from layout but "
@ -376,7 +376,7 @@ static VkResult validateDescriptorSetAllocation(const VkDescriptorSetAllocateInf
auto setsAvailable = poolInfo->maxSets - poolInfo->usedSets;
if (setsAvailable < pAllocateInfo->descriptorSetCount) {
mesa_logi(
mesa_logd(
"%s: Error: VkDescriptorSetAllocateInfo wants %u sets "
"but we only have %u available. "
"Bailing with VK_ERROR_OUT_OF_POOL_MEMORY.\n",
@ -391,7 +391,7 @@ static VkResult validateDescriptorSetAllocation(const VkDescriptorSetAllocateInf
for (uint32_t i = 0; i < pAllocateInfo->descriptorSetCount; ++i) {
if (!pAllocateInfo->pSetLayouts[i]) {
mesa_logi("%s: Error: Tried to allocate a descriptor set with null set layout.\n",
mesa_logd("%s: Error: Tried to allocate a descriptor set with null set layout.\n",
__func__);
return VK_ERROR_INITIALIZATION_FAILED;
}
@ -440,7 +440,7 @@ void removeDescriptorSetAllocation(VkDescriptorPool pool,
auto allocInfo = as_goldfish_VkDescriptorPool(pool)->allocInfo;
if (0 == allocInfo->usedSets) {
mesa_logi("%s: Warning: a descriptor set was double freed.\n", __func__);
mesa_logd("%s: Warning: a descriptor set was double freed.\n", __func__);
return;
}