From a6af76f3b317d9e27e5458afeb7f18ba66ab3bd9 Mon Sep 17 00:00:00 2001 From: nek0 Date: Thu, 24 Aug 2023 19:48:36 +0200 Subject: [PATCH] fix ambiguous record updates --- src/Devices.hs | 2 +- src/Main.hs | 1 + src/Memory.hs | 1 - vulkan-tutorial.cabal | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Devices.hs b/src/Devices.hs index 3e2f202..7fda8cc 100644 --- a/src/Devices.hs +++ b/src/Devices.hs @@ -39,7 +39,7 @@ pickPhysicalDevice vkInstance = do physDevices let discretePhysDevices = V.filter - (\(_, devProps, devFeatures) -> + (\(_, _, devFeatures) -> -- Vk.deviceType devProps == Vk.PHYSICAL_DEVICE_TYPE_DISCRETE_GPU && Vk.geometryShader devFeatures ) diff --git a/src/Main.hs b/src/Main.hs index 74fe74d..85a671f 100644 --- a/src/Main.hs +++ b/src/Main.hs @@ -2,6 +2,7 @@ {-# LANGUAGE OverloadedRecordDot #-} {-# LANGUAGE DuplicateRecordFields #-} {-# LANGUAGE DataKinds #-} +{-# LANGUAGE OverloadedRecordDot #-} module Main where import qualified Control.Concurrent.STM as STM diff --git a/src/Memory.hs b/src/Memory.hs index 052d7c1..3a0f11c 100644 --- a/src/Memory.hs +++ b/src/Memory.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE DuplicateRecordFields #-} {-# LANGUAGE DataKinds #-} {-# LANGUAGE OverloadedRecordDot #-} diff --git a/vulkan-tutorial.cabal b/vulkan-tutorial.cabal index b0c1026..0a4ac44 100644 --- a/vulkan-tutorial.cabal +++ b/vulkan-tutorial.cabal @@ -41,7 +41,7 @@ executable vulkan-tutorial -- LANGUAGE extensions used by modules in this package. -- other-extensions: - build-depends: base >=4.14.3.0 + build-depends: base , sdl2 , vulkan , vulkan-utils