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

Use old en/decoding for vkQueueSignalReleaseImage

Browse source 
We accidentially changed the xml definition for
vkQueueSignalReleaseImageANDROID. As a result it changed its encoding
and decoding, which breaks Android emulator when launching old system
images (API level 29~32).

To fix this, we overwrite it with the old definition so that it keeps
using the old encoding/decoding.

Note that API 33+ uses vkQueueSignalReleaseImageANDROIDAsyncGOOGLE which
does not have this problem.

Reviewed-by: Aaron Ruby <aruby@blackberry.com>
Acked-by: Yonggang Luo <luoyonggang@gmail.com>
Acked-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27246>
This commit is contained in:
Yahan Zhou 2023-12-04 13:08:33 -08:00 • committed by Marge Bot
parent 7ff621cf19
commit d9a71239b2
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/gfxstream/codegen/scripts/genvk.py
View file

@ -1179,7 +1179,7 @@ if __name__ == '__main__':
if name is not None:
return name
try:
return entry.find("proto").find("name")
return entry.find("proto").find("name").text
except AttributeError:
return None
@ -1198,6 +1198,7 @@ if __name__ == '__main__':
if name not in originalEntryDict.keys():
treeEntries.append(entry)
continue
print(f'Entry {entriesName}:{name}')
originalEntry = originalEntryDict[name]
@ -1213,7 +1214,7 @@ if __name__ == '__main__':
# Overwriting an existing entry. This happen for
# VkNativeBufferANDROID
if entriesName == "types":
if entriesName == "types" or entriesName == "commands":
originalEntry.clear()
originalEntry.attrib = entry.attrib
for child in entry:

8
src/gfxstream/codegen/xml/vk_gfxstream.xml
View file

@ -230,6 +230,14 @@ specific entries.
<param noautovalidity="true" len="waitSemaphoreCount">const <type>VkSemaphore</type>* <name>pWaitSemaphores</name></param>
<param><type>VkImage</type> <name>image</name></param>
</command>
<command>
<proto><type>VkResult</type> <name>vkQueueSignalReleaseImageANDROID</name></proto>
<param><type>VkQueue</type> <name>queue</name></param>
<param optional="true"><type>uint32_t</type> <name>waitSemaphoreCount</name></param>
<param noautovalidity="true" len="waitSemaphoreCount">const <type>VkSemaphore</type>* <name>pWaitSemaphores</name></param>
<param><type>VkImage</type> <name>image</name></param>
<param><type>int</type>* <name>pNativeFenceFd</name></param>
</command>
<command>
<proto><type>void</type> <name>vkQueueFlushCommandsFromAuxMemoryGOOGLE</name></proto>
<param externsync="true"><type>VkQueue</type> <name>queue</name></param>