joejulian/gio-patched
1
0
Fork 0
forked from joejulian/gio
Code Pull Requests 1 Activity

app: [Vulkan] don't exit early on VK_SUBOPTIMAL_KHR

Browse Source 
The mapErr helper may map the error to nil, in which case the caller
should continue, not exit.

This change split up error mapping into mapErr which never maps to nil,
and mapSurfaceErr which handles the VK_KHR_swapchain errors and may map
to nil.

Maybe fixes gio#287

Signed-off-by: Elias Naur <mail@eliasnaur.com>
This commit is contained in:
Elias Naur
2021-10-09 10:41:15 +02:00
parent bd1ef92dc4
commit ebad5afdf3
1 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/vulkan.go
+21 -15
View File
@@ -71,8 +71,8 @@ func (c *vkContext) RenderTarget() (gpu.RenderTarget, error) {
vk.DeviceWaitIdle(c.dev)
imgIdx, err := vk.AcquireNextImage(c.dev, c.swchain, c.acquireSem, 0)
if err != nil {
return nil, mapErr(err)
if err := mapSurfaceErr(err); err != nil {
return nil, err
}
c.presentIdx = imgIdx
return gpu.VulkanRenderTarget{
@@ -94,6 +94,14 @@ func (c *vkContext) api() gpu.API {
}
func mapErr(err error) error {
var vkErr vk.Error
if errors.As(err, &vkErr) && vkErr == vk.ERROR_DEVICE_LOST {
return gpu.ErrDeviceLost
}
return err
}
func mapSurfaceErr(err error) error {
var vkErr vk.Error
if !errors.As(err, &vkErr) {
return err
@@ -108,12 +116,10 @@ func mapErr(err error) error {
return errOutOfDate
case vkErr == vk.ERROR_SURFACE_LOST_KHR:
// Treating a lost surface as a lost device isn't accurate, but
// porbably not worth optimizing.
return gpu.ErrDeviceLost
case vkErr == vk.ERROR_DEVICE_LOST:
// probably not worth optimizing.
return gpu.ErrDeviceLost
}
return err
return mapErr(err)
}
func (c *vkContext) release() {
@@ -127,7 +133,7 @@ func (c *vkContext) release() {
}
func (c *vkContext) present() error {
return mapErr(vk.PresentQueue(c.queue, c.swchain, c.presentSem, c.presentIdx))
return mapSurfaceErr(vk.PresentQueue(c.queue, c.swchain, c.presentSem, c.presentIdx))
}
func (c *vkContext) destroyImageViews() {
@@ -170,8 +176,8 @@ func (c *vkContext) refresh(surf vk.Surface, width, height int) error {
vk.DestroySwapchain(c.dev, c.swchain)
c.swchain = 0
}
if err != nil {
return mapErr(err)
if err := mapSurfaceErr(err); err != nil {
return err
}
c.swchain = swchain
c.imgs = imgs
@@ -184,19 +190,19 @@ func (c *vkContext) refresh(surf vk.Surface, width, height int) error {
vk.IMAGE_LAYOUT_PRESENT_SRC_KHR,
nil,
)
if err != nil {
return mapErr(err)
if err := mapErr(err); err != nil {
return err
}
defer vk.DestroyRenderPass(c.dev, pass)
for _, img := range imgs {
view, err := vk.CreateImageView(c.dev, img, format)
if err != nil {
return mapErr(err)
if err := mapErr(err); err != nil {
return err
}
c.views = append(c.views, view)
fbo, err := vk.CreateFramebuffer(c.dev, pass, view, width, height)
if err != nil {
return mapErr(err)
if err := mapErr(err); err != nil {
return err
}
c.fbos = append(c.fbos, fbo)
}