Compare commits
No commits in common. "main" and "storage_buffer" have entirely different histories.
main
...
storage_bu
26 changed files with 165 additions and 4075 deletions
|
@ -1,13 +0,0 @@
|
||||||
# Blender MTL File: 'jaeger.blend'
|
|
||||||
# Material Count: 1
|
|
||||||
|
|
||||||
newmtl Material_jaeger.texture.tga
|
|
||||||
Ns 92.156863
|
|
||||||
Ka 1.000000 1.000000 1.000000
|
|
||||||
Kd 0.512000 0.512000 0.512000
|
|
||||||
Ks 0.500000 0.500000 0.500000
|
|
||||||
Ke 0.000000 0.000000 0.000000
|
|
||||||
Ni 1.000000
|
|
||||||
d 1.000000
|
|
||||||
illum 2
|
|
||||||
map_Kd jaeger.texture.tga
|
|
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
Binary file not shown.
Before Width: | Height: | Size: 167 KiB |
Binary file not shown.
Before Width: | Height: | Size: 32 MiB |
Binary file not shown.
Before Width: | Height: | Size: 4 MiB |
Binary file not shown.
Before Width: | Height: | Size: 4 MiB |
12
flake.lock
12
flake.lock
|
@ -5,11 +5,11 @@
|
||||||
"systems": "systems"
|
"systems": "systems"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1694529238,
|
"lastModified": 1681202837,
|
||||||
"narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
|
"narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
|
||||||
"owner": "numtide",
|
"owner": "numtide",
|
||||||
"repo": "flake-utils",
|
"repo": "flake-utils",
|
||||||
"rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
|
"rev": "cfacdce06f30d2b68473a46042957675eebb3401",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -20,11 +20,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1699181587,
|
"lastModified": 1682786779,
|
||||||
"narHash": "sha256-v35mUUgVU2ituIHPNHifpjl5uiYQYyLrpaMtz8X8Ums=",
|
"narHash": "sha256-m7QFzPS/CE8hbkbIVK4UStihAQMtczr0vSpOgETOM1g=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "197629b470f184a47b2a5716312d25b09454bbf8",
|
"rev": "08e4dc3a907a6dfec8bb3bbf1540d8abbffea22b",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
45
flake.nix
45
flake.nix
|
@ -11,36 +11,28 @@
|
||||||
let
|
let
|
||||||
pkgs = nixpkgs.legacyPackages.${system};
|
pkgs = nixpkgs.legacyPackages.${system};
|
||||||
|
|
||||||
nixos-lib = import (nixpkgs + "/nixos/lib") {};
|
haskellPackages = pkgs.haskellPackages;
|
||||||
|
|
||||||
haskellPackages = pkgs.haskellPackages.override (old: {
|
|
||||||
overrides = final: prev: {
|
|
||||||
wavefront = jailbreakUnbreak prev.wavefront;
|
|
||||||
vulkan-tutorial = vulkan-tutorial;
|
|
||||||
};
|
|
||||||
});
|
|
||||||
|
|
||||||
vulkan-tutorial = # (ref:haskell-package-def)
|
|
||||||
haskellPackages.callCabal2nix packageName self {
|
|
||||||
# Dependency overrides go here
|
|
||||||
#wavefront = jailbreakUnbreak haskellPackages.wavefront;
|
|
||||||
};
|
|
||||||
|
|
||||||
jailbreakUnbreak = pkg:
|
jailbreakUnbreak = pkg:
|
||||||
pkgs.haskell.lib.doJailbreak (pkgs.haskell.lib.markUnbroken pkg);
|
pkgs.haskell.lib.doJailbreak (pkg.overrideAttrs (_: { meta = { }; }));
|
||||||
|
|
||||||
packageName = "vulkan-tutorial";
|
packageName = "vulkan-tutorial";
|
||||||
in rec {
|
in rec {
|
||||||
packages.default = haskellPackages.vulkan-tutorial;
|
packages.${packageName} = # (ref:haskell-package-def)
|
||||||
|
haskellPackages.callCabal2nix packageName self rec {
|
||||||
|
# Dependency overrides go here
|
||||||
|
wavefront = jailbreakUnbreak haskellPackages.wavefront;
|
||||||
|
};
|
||||||
|
|
||||||
devShells.default = haskellPackages.shellFor {
|
defaultPackage = self.packages.${system}.${packageName};
|
||||||
packages = p: [ p.vulkan-tutorial ];
|
|
||||||
|
devShell = haskellPackages.shellFor {
|
||||||
|
packages = p: [ defaultPackage ];
|
||||||
withHoogle = true;
|
withHoogle = true;
|
||||||
buildInputs = (with haskellPackages; [
|
buildInputs = (with haskellPackages; [
|
||||||
haskell-language-server
|
haskell-language-server
|
||||||
ghcid
|
ghcid
|
||||||
cabal-install
|
cabal-install
|
||||||
(jailbreakUnbreak wavefront)
|
|
||||||
]) ++ (with pkgs; [
|
]) ++ (with pkgs; [
|
||||||
shaderc
|
shaderc
|
||||||
vulkan-loader
|
vulkan-loader
|
||||||
|
@ -50,6 +42,21 @@
|
||||||
VK_LAYER_PATH="${pkgs.vulkan-validation-layers}/share/vulkan/explicit_layer.d";
|
VK_LAYER_PATH="${pkgs.vulkan-validation-layers}/share/vulkan/explicit_layer.d";
|
||||||
SDL_VULKAN_LIBRARY="${pkgs.vulkan-loader}/lib/libvulkan.so";
|
SDL_VULKAN_LIBRARY="${pkgs.vulkan-loader}/lib/libvulkan.so";
|
||||||
};
|
};
|
||||||
|
#devShell = pkgs.mkShell {
|
||||||
|
# buildInputs = with haskellPackages; [
|
||||||
|
# haskell-language-server
|
||||||
|
# ghcid
|
||||||
|
# cabal-install
|
||||||
|
# ];
|
||||||
|
# nativeBuildInputs = with pkgs; [
|
||||||
|
# pkg-config
|
||||||
|
# SDL2
|
||||||
|
# vulkan-validation-layers
|
||||||
|
# vulkan-headers
|
||||||
|
# vulkan-loader
|
||||||
|
# ];
|
||||||
|
# inputsFrom = builtins.attrValues self.packages.${system};
|
||||||
|
#};
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,24 +0,0 @@
|
||||||
//glsl version 4.5
|
|
||||||
#version 450
|
|
||||||
|
|
||||||
//shader input
|
|
||||||
layout (location = 0) in vec4 inColor;
|
|
||||||
layout (location = 1) in vec2 texCoord;
|
|
||||||
//output write
|
|
||||||
layout (location = 0) out vec4 outFragColor;
|
|
||||||
|
|
||||||
layout(set = 0, binding = 1) uniform SceneData{
|
|
||||||
vec4 fogColor; // w is for exponent
|
|
||||||
vec4 fogDistances; //x for min, y for max, zw unused.
|
|
||||||
vec4 ambientColor;
|
|
||||||
vec4 sunlightDirection; //w for sun power
|
|
||||||
vec4 sunlightColor;
|
|
||||||
} sceneData;
|
|
||||||
|
|
||||||
layout(set = 2, binding = 0) uniform sampler2D tex1;
|
|
||||||
|
|
||||||
void main()
|
|
||||||
{
|
|
||||||
vec3 color = texture(tex1, texCoord).xyz;
|
|
||||||
outFragColor = vec4(color, inColor.w);
|
|
||||||
}
|
|
|
@ -2,10 +2,8 @@
|
||||||
layout (location = 0) in vec3 vPosition;
|
layout (location = 0) in vec3 vPosition;
|
||||||
layout (location = 1) in vec3 vNormal;
|
layout (location = 1) in vec3 vNormal;
|
||||||
layout (location = 2) in vec4 vColor;
|
layout (location = 2) in vec4 vColor;
|
||||||
layout (location = 3) in vec2 vTexCoord;
|
|
||||||
|
|
||||||
layout (location = 0) out vec4 outColor;
|
layout (location = 0) out vec4 outColor;
|
||||||
layout (location = 1) out vec2 texCoord;
|
|
||||||
|
|
||||||
layout(set = 0, binding = 0) uniform CameraBuffer{
|
layout(set = 0, binding = 0) uniform CameraBuffer{
|
||||||
mat4 view;
|
mat4 view;
|
||||||
|
@ -36,5 +34,4 @@ void main()
|
||||||
mat4 transformMatrix = (cameraData.viewproj * modelMatrix);
|
mat4 transformMatrix = (cameraData.viewproj * modelMatrix);
|
||||||
gl_Position = transformMatrix * vec4(vPosition, 1.0f);
|
gl_Position = transformMatrix * vec4(vPosition, 1.0f);
|
||||||
outColor = vColor;
|
outColor = vColor;
|
||||||
texCoord = vTexCoord;
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
{-# LANGUAGE OverloadedStrings #-}
|
||||||
{-# LANGUAGE DuplicateRecordFields #-}
|
{-# LANGUAGE DuplicateRecordFields #-}
|
||||||
{-# LANGUAGE DataKinds #-}
|
{-# LANGUAGE DataKinds #-}
|
||||||
{-# LANGUAGE FlexibleContexts #-}
|
{-# LANGUAGE FlexibleContexts #-}
|
||||||
|
@ -19,10 +20,10 @@ import qualified VulkanMemoryAllocator as VMA
|
||||||
|
|
||||||
-- internal imports
|
-- internal imports
|
||||||
|
|
||||||
|
import Devices
|
||||||
import Types
|
import Types
|
||||||
import Memory
|
import Memory
|
||||||
import Util
|
import Util
|
||||||
import Mesh (compactDraws)
|
|
||||||
|
|
||||||
frameOverlap :: Int
|
frameOverlap :: Int
|
||||||
frameOverlap = 2
|
frameOverlap = 2
|
||||||
|
@ -32,21 +33,16 @@ maxObjects = 10000
|
||||||
|
|
||||||
createFrames
|
createFrames
|
||||||
:: (MonadResource m, MonadFail m)
|
:: (MonadResource m, MonadFail m)
|
||||||
=> Vk.Device
|
=> Vk.PhysicalDevice
|
||||||
|
-> Vk.Device
|
||||||
-> VMA.Allocator
|
-> VMA.Allocator
|
||||||
-> Vk.DescriptorPool
|
-> Vk.DescriptorPool
|
||||||
-> Vk.DescriptorSetLayout
|
-> Vk.DescriptorSetLayout
|
||||||
-> Vk.DescriptorSetLayout
|
-> Vk.DescriptorSetLayout
|
||||||
-> Word32
|
|
||||||
-> m (V.Vector FrameData, Vk.Queue)
|
-> m (V.Vector FrameData, Vk.Queue)
|
||||||
createFrames
|
createFrames physicalDevice logicalDevice allocator descriptorPool setLayout objectSetLayout = do
|
||||||
logicalDevice
|
|
||||||
allocator
|
queueFamilyIndex <- getQueueFamily physicalDevice Vk.QUEUE_GRAPHICS_BIT
|
||||||
descriptorPool
|
|
||||||
setLayout
|
|
||||||
objectSetLayout
|
|
||||||
queueFamilyIndex
|
|
||||||
= do
|
|
||||||
|
|
||||||
let poolCreateInfo = Vk.zero
|
let poolCreateInfo = Vk.zero
|
||||||
{ Vk.flags = Vk.COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT
|
{ Vk.flags = Vk.COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT
|
||||||
|
@ -59,7 +55,7 @@ createFrames
|
||||||
(\_ -> do
|
(\_ -> do
|
||||||
|
|
||||||
commandPool <- snd <$>
|
commandPool <- snd <$>
|
||||||
Vk.withCommandPool logicalDevice poolCreateInfo Nothing allocate
|
(Vk.withCommandPool logicalDevice poolCreateInfo Nothing allocate)
|
||||||
|
|
||||||
let commandBufferAllocationInfo = Vk.zero
|
let commandBufferAllocationInfo = Vk.zero
|
||||||
{ Vk.commandPool = commandPool
|
{ Vk.commandPool = commandPool
|
||||||
|
@ -99,15 +95,6 @@ createFrames
|
||||||
Vk.BUFFER_USAGE_STORAGE_BUFFER_BIT
|
Vk.BUFFER_USAGE_STORAGE_BUFFER_BIT
|
||||||
VMA.MEMORY_USAGE_CPU_TO_GPU
|
VMA.MEMORY_USAGE_CPU_TO_GPU
|
||||||
|
|
||||||
indirectBuffer <- createAllocatedBuffer
|
|
||||||
allocator
|
|
||||||
(maxObjects * sizeOf (undefined :: Vk.DrawIndirectCommand))
|
|
||||||
(Vk.BUFFER_USAGE_TRANSFER_DST_BIT .|.
|
|
||||||
Vk.BUFFER_USAGE_STORAGE_BUFFER_BIT .|.
|
|
||||||
Vk.BUFFER_USAGE_INDIRECT_BUFFER_BIT
|
|
||||||
)
|
|
||||||
VMA.MEMORY_USAGE_CPU_TO_GPU
|
|
||||||
|
|
||||||
let allocationInfo = Vk.zero
|
let allocationInfo = Vk.zero
|
||||||
{ Vk.descriptorPool = descriptorPool
|
{ Vk.descriptorPool = descriptorPool
|
||||||
, Vk.setLayouts = V.singleton setLayout
|
, Vk.setLayouts = V.singleton setLayout
|
||||||
|
@ -169,7 +156,6 @@ createFrames
|
||||||
, frameCameraBuffer = cameraBuffer
|
, frameCameraBuffer = cameraBuffer
|
||||||
, frameSceneBuffer = sceneBuffer
|
, frameSceneBuffer = sceneBuffer
|
||||||
, frameObjectBuffer = objectBuffer
|
, frameObjectBuffer = objectBuffer
|
||||||
, frameIndirectBuffer = indirectBuffer
|
|
||||||
, frameGlobalDescriptor = V.head globalDescriptor
|
, frameGlobalDescriptor = V.head globalDescriptor
|
||||||
, frameObjectDescriptor = V.head objectDescriptor
|
, frameObjectDescriptor = V.head objectDescriptor
|
||||||
}
|
}
|
||||||
|
@ -181,8 +167,7 @@ createFrames
|
||||||
|
|
||||||
recordCommandBuffer
|
recordCommandBuffer
|
||||||
:: (MonadResource m, MonadReader ReadState m, MonadIO m)
|
:: (MonadResource m, MonadReader ReadState m, MonadIO m)
|
||||||
=> VMA.Allocator
|
=> Vk.CommandBuffer
|
||||||
-> Vk.CommandBuffer
|
|
||||||
-> Vk.RenderPass
|
-> Vk.RenderPass
|
||||||
-> Vk.Framebuffer
|
-> Vk.Framebuffer
|
||||||
-> V2 CInt
|
-> V2 CInt
|
||||||
|
@ -190,7 +175,6 @@ recordCommandBuffer
|
||||||
-> FrameData
|
-> FrameData
|
||||||
-> m ()
|
-> m ()
|
||||||
recordCommandBuffer
|
recordCommandBuffer
|
||||||
allocator
|
|
||||||
commandBuffer
|
commandBuffer
|
||||||
renderPass
|
renderPass
|
||||||
frameBuffer
|
frameBuffer
|
||||||
|
@ -232,54 +216,18 @@ recordCommandBuffer
|
||||||
|
|
||||||
renderObjects <- (liftIO . STM.atomically . STM.readTMVar) =<< asks renderables
|
renderObjects <- (liftIO . STM.atomically . STM.readTMVar) =<< asks renderables
|
||||||
meshMap <- (liftIO . STM.atomically . STM.readTMVar) =<< asks meshLibrary
|
meshMap <- (liftIO . STM.atomically . STM.readTMVar) =<< asks meshLibrary
|
||||||
|
|
||||||
|
V.mapM_
|
||||||
|
(\(index, RenderObject meshID materialID modelMatrix) -> do
|
||||||
|
|
||||||
materialMap <- (liftIO . STM.atomically . STM.readTMVar) =<< asks materialLibrary
|
materialMap <- (liftIO . STM.atomically . STM.readTMVar) =<< asks materialLibrary
|
||||||
|
|
||||||
let draws = compactDraws meshMap materialMap renderObjects
|
let constants = MeshPushConstants
|
||||||
drawCommands = V.map
|
{ meshPushData = V4 0 0 0 0
|
||||||
(\(i, RenderObject mesh _ _) ->
|
, meshRenderMatrix = transpose modelMatrix
|
||||||
Vk.DrawIndirectCommand
|
|
||||||
{ vertexCount = fromIntegral (V.length $ meshVertices $ meshMap M.! mesh)
|
|
||||||
, firstVertex = 0
|
|
||||||
, instanceCount = 1
|
|
||||||
, firstInstance = i
|
|
||||||
}
|
}
|
||||||
)
|
mesh = meshMap M.! meshID
|
||||||
(V.zip
|
material = materialMap M.! materialID
|
||||||
(V.fromList [0..])
|
|
||||||
renderObjects
|
|
||||||
)
|
|
||||||
|
|
||||||
(memRelease, memPtr) <- VMA.withMappedMemory
|
|
||||||
allocator
|
|
||||||
(bufferAllocation $ frameIndirectBuffer frame)
|
|
||||||
allocate
|
|
||||||
|
|
||||||
V.mapM_
|
|
||||||
(\(idx, command) -> liftIO $
|
|
||||||
poke
|
|
||||||
(castPtr memPtr `plusPtr` (idx * sizeOf command))
|
|
||||||
command
|
|
||||||
)
|
|
||||||
(V.zip
|
|
||||||
(V.fromList [0 ..])
|
|
||||||
drawCommands
|
|
||||||
)
|
|
||||||
|
|
||||||
release memRelease
|
|
||||||
|
|
||||||
V.mapM_
|
|
||||||
(\(IndirectBatch mesh material first count) -> do
|
|
||||||
|
|
||||||
when
|
|
||||||
(materialTextureSet material /= Vk.NULL_HANDLE)
|
|
||||||
(Vk.cmdBindDescriptorSets
|
|
||||||
commandBuffer
|
|
||||||
Vk.PIPELINE_BIND_POINT_GRAPHICS
|
|
||||||
(materialPipelineLayout material)
|
|
||||||
2
|
|
||||||
(V.singleton $ materialTextureSet material)
|
|
||||||
V.empty
|
|
||||||
)
|
|
||||||
|
|
||||||
Vk.cmdBindPipeline commandBuffer Vk.PIPELINE_BIND_POINT_GRAPHICS (materialPipeline material)
|
Vk.cmdBindPipeline commandBuffer Vk.PIPELINE_BIND_POINT_GRAPHICS (materialPipeline material)
|
||||||
|
|
||||||
|
@ -299,24 +247,28 @@ recordCommandBuffer
|
||||||
(V.singleton $ frameObjectDescriptor frame)
|
(V.singleton $ frameObjectDescriptor frame)
|
||||||
V.empty
|
V.empty
|
||||||
|
|
||||||
|
dataPointer <- liftIO (castPtr <$> new constants)
|
||||||
|
|
||||||
|
Vk.cmdPushConstants
|
||||||
|
commandBuffer
|
||||||
|
(materialPipelineLayout material)
|
||||||
|
Vk.SHADER_STAGE_VERTEX_BIT
|
||||||
|
0
|
||||||
|
(fromIntegral $ sizeOf constants)
|
||||||
|
dataPointer
|
||||||
|
|
||||||
Vk.cmdBindVertexBuffers
|
Vk.cmdBindVertexBuffers
|
||||||
commandBuffer
|
commandBuffer
|
||||||
0
|
0
|
||||||
(V.fromList [ allocatedBuffer $ meshBuffer mesh ])
|
(V.fromList [ allocatedBuffer $ meshBuffer mesh ])
|
||||||
(V.fromList [ 0 ])
|
(V.fromList [ 0 ])
|
||||||
|
|
||||||
let indirectOffset = fromIntegral $
|
Vk.cmdDraw commandBuffer (fromIntegral $ V.length $ meshVertices mesh) 1 0 index
|
||||||
first * fromIntegral ( sizeOf (undefined :: Vk.DrawIndirectCommand))
|
)
|
||||||
drawStride = fromIntegral $ sizeOf (undefined :: Vk.DrawIndirectCommand)
|
(V.zip
|
||||||
|
(V.fromList [0 ..])
|
||||||
Vk.cmdDrawIndirect
|
renderObjects
|
||||||
commandBuffer
|
|
||||||
(allocatedBuffer $ frameIndirectBuffer frame)
|
|
||||||
indirectOffset
|
|
||||||
count
|
|
||||||
drawStride
|
|
||||||
)
|
)
|
||||||
draws
|
|
||||||
|
|
||||||
prepareRecording
|
prepareRecording
|
||||||
:: V2 CInt
|
:: V2 CInt
|
||||||
|
@ -326,12 +278,11 @@ prepareRecording
|
||||||
prepareRecording (V2 width height) commandBuffer graphicsPipeline = do
|
prepareRecording (V2 width height) commandBuffer graphicsPipeline = do
|
||||||
Vk.cmdBindPipeline commandBuffer Vk.PIPELINE_BIND_POINT_GRAPHICS graphicsPipeline
|
Vk.cmdBindPipeline commandBuffer Vk.PIPELINE_BIND_POINT_GRAPHICS graphicsPipeline
|
||||||
|
|
||||||
-- Passing negative height and nonzero y origin to the viewport flips the models back in order
|
|
||||||
let viewport = Vk.zero
|
let viewport = Vk.zero
|
||||||
{ Vk.x = 0
|
{ Vk.x = 0
|
||||||
, Vk.y = fromIntegral height
|
, Vk.y = 0
|
||||||
, Vk.width = fromIntegral width
|
, Vk.width = fromIntegral width
|
||||||
, Vk.height = - fromIntegral height
|
, Vk.height = fromIntegral height
|
||||||
, Vk.minDepth = 0
|
, Vk.minDepth = 0
|
||||||
, Vk.maxDepth = 1
|
, Vk.maxDepth = 1
|
||||||
}
|
}
|
||||||
|
@ -372,7 +323,7 @@ pokeData frame frameNumber sceneParameters cameraParameters = do
|
||||||
V.mapM_
|
V.mapM_
|
||||||
(\(index, obj) -> do
|
(\(index, obj) -> do
|
||||||
|
|
||||||
let modelMatrix = GPUObjectData (objectMatrix obj)
|
let modelMatrix = GPUObjectData (transpose $ objectMatrix obj)
|
||||||
|
|
||||||
liftIO $ poke
|
liftIO $ poke
|
||||||
(castPtr objectPointer `plusPtr` (index * sizeOf (undefined :: GPUObjectData)))
|
(castPtr objectPointer `plusPtr` (index * sizeOf (undefined :: GPUObjectData)))
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
{-# LANGUAGE OverloadedStrings #-}
|
{-# LANGUAGE OverloadedStrings #-}
|
||||||
{-# LANGUAGE DuplicateRecordFields #-}
|
{-# LANGUAGE DuplicateRecordFields #-}
|
||||||
{-# LANGUAGE DataKinds #-}
|
{-# LANGUAGE DataKinds #-}
|
||||||
{-# LANGUAGE OverloadedRecordDot #-}
|
|
||||||
module Devices where
|
module Devices where
|
||||||
|
|
||||||
import Control.Monad
|
import Control.Monad
|
||||||
|
@ -39,7 +38,7 @@ pickPhysicalDevice vkInstance = do
|
||||||
physDevices
|
physDevices
|
||||||
|
|
||||||
let discretePhysDevices = V.filter
|
let discretePhysDevices = V.filter
|
||||||
(\(_, _, devFeatures) ->
|
(\(_, devProps, devFeatures) ->
|
||||||
-- Vk.deviceType devProps == Vk.PHYSICAL_DEVICE_TYPE_DISCRETE_GPU &&
|
-- Vk.deviceType devProps == Vk.PHYSICAL_DEVICE_TYPE_DISCRETE_GPU &&
|
||||||
Vk.geometryShader devFeatures
|
Vk.geometryShader devFeatures
|
||||||
)
|
)
|
||||||
|
@ -91,7 +90,7 @@ createLogicalDevice
|
||||||
:: (MonadResource m)
|
:: (MonadResource m)
|
||||||
=> Vk.PhysicalDevice
|
=> Vk.PhysicalDevice
|
||||||
-> Vk.SurfaceKHR
|
-> Vk.SurfaceKHR
|
||||||
-> m (Vk.Device, V.Vector Vk.SurfaceFormatKHR, Word32)
|
-> m (Vk.Device, V.Vector Vk.SurfaceFormatKHR)
|
||||||
createLogicalDevice physDevice surface = do
|
createLogicalDevice physDevice surface = do
|
||||||
|
|
||||||
graphicsQueueFamily <- getQueueFamily physDevice Vk.QUEUE_GRAPHICS_BIT
|
graphicsQueueFamily <- getQueueFamily physDevice Vk.QUEUE_GRAPHICS_BIT
|
||||||
|
@ -105,9 +104,6 @@ createLogicalDevice physDevice surface = do
|
||||||
deviceCreateInfo = Vk.zero
|
deviceCreateInfo = Vk.zero
|
||||||
{ Vk.queueCreateInfos = V.singleton (Vk.SomeStruct queueCreateInfo)
|
{ Vk.queueCreateInfos = V.singleton (Vk.SomeStruct queueCreateInfo)
|
||||||
, Vk.enabledExtensionNames = extensionNames
|
, Vk.enabledExtensionNames = extensionNames
|
||||||
, Vk.enabledFeatures = Just (Vk.zero
|
|
||||||
{ Vk.multiDrawIndirect = True
|
|
||||||
} :: Vk.PhysicalDeviceFeatures)
|
|
||||||
}
|
}
|
||||||
shaderDrawParametersFeatures = Vk.zero
|
shaderDrawParametersFeatures = Vk.zero
|
||||||
{ Vk.shaderDrawParameters = True
|
{ Vk.shaderDrawParameters = True
|
||||||
|
@ -124,7 +120,7 @@ createLogicalDevice physDevice surface = do
|
||||||
unless (result == Vk.SUCCESS) $
|
unless (result == Vk.SUCCESS) $
|
||||||
error "createLogicalDevice: Failed retrieving surface image formats"
|
error "createLogicalDevice: Failed retrieving surface image formats"
|
||||||
|
|
||||||
return (logDevice, formats, graphicsQueueFamily)
|
return (logDevice, formats)
|
||||||
|
|
||||||
createSwapchain
|
createSwapchain
|
||||||
:: (MonadResource m)
|
:: (MonadResource m)
|
||||||
|
@ -144,9 +140,9 @@ createSwapchain surface surfaceFormats windowDimension logicalDevice allocator =
|
||||||
if
|
if
|
||||||
V.any
|
V.any
|
||||||
(\a ->
|
(\a ->
|
||||||
a.format ==
|
(Vk.format :: Vk.SurfaceFormatKHR -> Vk.Format) a ==
|
||||||
Vk.FORMAT_B8G8R8A8_SRGB
|
Vk.FORMAT_B8G8R8A8_SRGB
|
||||||
&& a.colorSpace ==
|
&& (Vk.colorSpace :: Vk.SurfaceFormatKHR -> Vk.ColorSpaceKHR) a ==
|
||||||
Vk.COLOR_SPACE_SRGB_NONLINEAR_KHR)
|
Vk.COLOR_SPACE_SRGB_NONLINEAR_KHR)
|
||||||
surfaceFormats
|
surfaceFormats
|
||||||
then
|
then
|
||||||
|
@ -223,7 +219,7 @@ getImageViewHandles swapchain surfaceFormat logicalDevice = do
|
||||||
let createInfo = Vk.zero
|
let createInfo = Vk.zero
|
||||||
{ Vk.image = tmpImage
|
{ Vk.image = tmpImage
|
||||||
, Vk.viewType = Vk.IMAGE_VIEW_TYPE_2D
|
, Vk.viewType = Vk.IMAGE_VIEW_TYPE_2D
|
||||||
, Vk.format = surfaceFormat.format
|
, Vk.format = (Vk.format :: Vk.SurfaceFormatKHR -> Vk.Format) surfaceFormat
|
||||||
, Vk.components = Vk.ComponentMapping
|
, Vk.components = Vk.ComponentMapping
|
||||||
{ Vk.r = Vk.COMPONENT_SWIZZLE_IDENTITY
|
{ Vk.r = Vk.COMPONENT_SWIZZLE_IDENTITY
|
||||||
, Vk.g = Vk.COMPONENT_SWIZZLE_IDENTITY
|
, Vk.g = Vk.COMPONENT_SWIZZLE_IDENTITY
|
||||||
|
|
10
src/Draw.hs
10
src/Draw.hs
|
@ -1,7 +1,6 @@
|
||||||
{-# LANGUAGE OverloadedStrings #-}
|
{-# LANGUAGE OverloadedStrings #-}
|
||||||
{-# LANGUAGE DuplicateRecordFields #-}
|
{-# LANGUAGE DuplicateRecordFields #-}
|
||||||
{-# LANGUAGE FlexibleContexts #-}
|
{-# LANGUAGE FlexibleContexts #-}
|
||||||
{-# LANGUAGE OverloadedRecordDot #-}
|
|
||||||
module Draw where
|
module Draw where
|
||||||
|
|
||||||
import qualified Control.Concurrent.STM as STM
|
import qualified Control.Concurrent.STM as STM
|
||||||
|
@ -58,7 +57,7 @@ drawFrame engineData frameNumber = do
|
||||||
let (V2 width height) = engineWindowDimensions engineData
|
let (V2 width height) = engineWindowDimensions engineData
|
||||||
camPosition = V3
|
camPosition = V3
|
||||||
(-10 * sin (fromIntegral frameNumber / 90))
|
(-10 * sin (fromIntegral frameNumber / 90))
|
||||||
2
|
(-2)
|
||||||
(-10 * cos (fromIntegral frameNumber / 90))
|
(-10 * cos (fromIntegral frameNumber / 90))
|
||||||
camCenter = V3 0 0 0
|
camCenter = V3 0 0 0
|
||||||
camUp = V3 0 1 0
|
camUp = V3 0 1 0
|
||||||
|
@ -69,9 +68,9 @@ drawFrame engineData frameNumber = do
|
||||||
0.1
|
0.1
|
||||||
200
|
200
|
||||||
cameraData = GPUCameraData
|
cameraData = GPUCameraData
|
||||||
{ view = camView
|
{ view = transpose camView
|
||||||
, projection = camProjection
|
, projection = transpose camProjection
|
||||||
, viewProjection = camProjection !*! camView
|
, viewProjection = transpose $ camProjection !*! camView
|
||||||
}
|
}
|
||||||
|
|
||||||
pokeData
|
pokeData
|
||||||
|
@ -81,7 +80,6 @@ drawFrame engineData frameNumber = do
|
||||||
cameraData
|
cameraData
|
||||||
|
|
||||||
recordCommandBuffer
|
recordCommandBuffer
|
||||||
(engineData.engineAllocator)
|
|
||||||
(frameMainCommandBuffer frame)
|
(frameMainCommandBuffer frame)
|
||||||
(engineRenderPass engineData)
|
(engineRenderPass engineData)
|
||||||
(engineFramebuffers engineData V.! fromIntegral index)
|
(engineFramebuffers engineData V.! fromIntegral index)
|
||||||
|
|
|
@ -194,7 +194,6 @@ createGraphicsPipelines
|
||||||
-> V2 CInt
|
-> V2 CInt
|
||||||
-> Vk.PipelineLayout
|
-> Vk.PipelineLayout
|
||||||
-> Maybe Vk.PipelineDepthStencilStateCreateInfo
|
-> Maybe Vk.PipelineDepthStencilStateCreateInfo
|
||||||
-> String
|
|
||||||
-> m ()
|
-> m ()
|
||||||
createGraphicsPipelines
|
createGraphicsPipelines
|
||||||
logicalDevice
|
logicalDevice
|
||||||
|
@ -203,7 +202,6 @@ createGraphicsPipelines
|
||||||
(V2 width height)
|
(V2 width height)
|
||||||
pipelineLayout
|
pipelineLayout
|
||||||
depthState
|
depthState
|
||||||
materialName
|
|
||||||
= do
|
= do
|
||||||
meshLib <- (liftIO . STM.atomically . STM.readTMVar) =<< asks meshLibrary
|
meshLib <- (liftIO . STM.atomically . STM.readTMVar) =<< asks meshLibrary
|
||||||
let pipelineStagesCreateInfos =
|
let pipelineStagesCreateInfos =
|
||||||
|
@ -306,10 +304,10 @@ createGraphicsPipelines
|
||||||
error "createGraphicsPipelines: Failed creating pipelines"
|
error "createGraphicsPipelines: Failed creating pipelines"
|
||||||
return pipelines
|
return pipelines
|
||||||
)
|
)
|
||||||
let material = Material Vk.NULL_HANDLE (V.head pipeline) pipelineLayout
|
let material = Material (V.head pipeline) pipelineLayout
|
||||||
matLibraryTMVar <- asks materialLibrary
|
matLibraryTMVar <- asks materialLibrary
|
||||||
matLibrary <- liftIO $ STM.atomically $ STM.readTMVar matLibraryTMVar
|
matLibrary <- liftIO $ STM.atomically $ STM.readTMVar matLibraryTMVar
|
||||||
let newMatLibrary = M.insert materialName material matLibrary
|
let newMatLibrary = M.insert "defaultMesh" material matLibrary
|
||||||
void $ liftIO $ STM.atomically $ STM.swapTMVar matLibraryTMVar newMatLibrary
|
void $ liftIO $ STM.atomically $ STM.swapTMVar matLibraryTMVar newMatLibrary
|
||||||
|
|
||||||
createMeshPipelineLayout
|
createMeshPipelineLayout
|
||||||
|
|
128
src/Init.hs
128
src/Init.hs
|
@ -10,16 +10,12 @@ import Control.Monad
|
||||||
import Control.Monad.IO.Class
|
import Control.Monad.IO.Class
|
||||||
import Control.Monad.Reader
|
import Control.Monad.Reader
|
||||||
import Control.Monad.Trans.Resource
|
import Control.Monad.Trans.Resource
|
||||||
import Data.Bits
|
|
||||||
import qualified Data.Map.Strict as M
|
|
||||||
import Data.Maybe
|
|
||||||
import qualified Data.Vector as V
|
import qualified Data.Vector as V
|
||||||
import qualified SDL hiding (V2)
|
import qualified SDL hiding (V2)
|
||||||
import qualified SDL.Video.Vulkan as SDL
|
import qualified SDL.Video.Vulkan as SDL
|
||||||
import Foreign.Ptr
|
import Foreign.Ptr
|
||||||
import Linear as L
|
import Linear as L
|
||||||
import qualified Vulkan as Vk
|
import qualified Vulkan.Core10 as Vk
|
||||||
import qualified Vulkan.CStruct.Extends as Vk
|
|
||||||
import qualified Vulkan.Extensions.VK_KHR_swapchain as Khr
|
import qualified Vulkan.Extensions.VK_KHR_swapchain as Khr
|
||||||
import qualified Vulkan.Extensions.VK_KHR_surface as Khr
|
import qualified Vulkan.Extensions.VK_KHR_surface as Khr
|
||||||
import qualified Vulkan.Zero as Vk
|
import qualified Vulkan.Zero as Vk
|
||||||
|
@ -34,8 +30,6 @@ import Memory
|
||||||
import Types
|
import Types
|
||||||
import Mesh
|
import Mesh
|
||||||
import CommandBuffer
|
import CommandBuffer
|
||||||
import Sync
|
|
||||||
import Textures
|
|
||||||
import Util
|
import Util
|
||||||
|
|
||||||
initEngine
|
initEngine
|
||||||
|
@ -93,13 +87,9 @@ initVulkan window = do
|
||||||
)
|
)
|
||||||
|
|
||||||
vulkanPhysicalDevice <- pickPhysicalDevice vulkanInstance
|
vulkanPhysicalDevice <- pickPhysicalDevice vulkanInstance
|
||||||
(vulkanLogicalDevice, surfaceFormats, queueIndex) <-
|
(vulkanLogicalDevice, surfaceFormats) <- createLogicalDevice vulkanPhysicalDevice vulkanSurface
|
||||||
createLogicalDevice vulkanPhysicalDevice vulkanSurface
|
|
||||||
|
|
||||||
uploadContext <- initSyncStructures vulkanLogicalDevice queueIndex
|
(descriptorSetLayout1, descriptorSetLayout2, descriptorPool) <- initDescriptors vulkanLogicalDevice
|
||||||
|
|
||||||
(descriptorSetLayout1, descriptorSetLayout2, textureDescriptorSetLayout, descriptorPool) <-
|
|
||||||
initDescriptors vulkanLogicalDevice
|
|
||||||
|
|
||||||
allocator <- initAllocator vulkanPhysicalDevice vulkanLogicalDevice vulkanInstance
|
allocator <- initAllocator vulkanPhysicalDevice vulkanLogicalDevice vulkanInstance
|
||||||
|
|
||||||
|
@ -109,26 +99,15 @@ initVulkan window = do
|
||||||
imageViews <- getImageViewHandles swapchain surfaceFormat vulkanLogicalDevice
|
imageViews <- getImageViewHandles swapchain surfaceFormat vulkanLogicalDevice
|
||||||
meshVertexShader <- loadShader vulkanLogicalDevice "shadersrc/tri_mesh.vert" "vert"
|
meshVertexShader <- loadShader vulkanLogicalDevice "shadersrc/tri_mesh.vert" "vert"
|
||||||
meshFragmentShader <- loadShader vulkanLogicalDevice "shadersrc/rainbow_lit.frag" "frag"
|
meshFragmentShader <- loadShader vulkanLogicalDevice "shadersrc/rainbow_lit.frag" "frag"
|
||||||
textureFragmentShader <- loadShader vulkanLogicalDevice "shadersrc/textured_lit.frag" "frag"
|
|
||||||
renderPass <- createRenderPass vulkanLogicalDevice (Khr.format surfaceFormat) Vk.FORMAT_D32_SFLOAT
|
renderPass <- createRenderPass vulkanLogicalDevice (Khr.format surfaceFormat) Vk.FORMAT_D32_SFLOAT
|
||||||
meshLayout <- createMeshPipelineLayout
|
meshLayout <- createMeshPipelineLayout
|
||||||
vulkanLogicalDevice
|
vulkanLogicalDevice
|
||||||
(V.fromList
|
(V.fromList
|
||||||
[ descriptorSetLayout1
|
[ descriptorSetLayout1
|
||||||
, descriptorSetLayout2
|
, descriptorSetLayout2
|
||||||
, textureDescriptorSetLayout
|
|
||||||
]
|
|
||||||
)
|
|
||||||
textureLayout <- createMeshPipelineLayout
|
|
||||||
vulkanLogicalDevice
|
|
||||||
(V.fromList
|
|
||||||
[ descriptorSetLayout1
|
|
||||||
, descriptorSetLayout2
|
|
||||||
, textureDescriptorSetLayout
|
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
let meshContainer = ShaderContainer (Just meshVertexShader) (Just meshFragmentShader)
|
let meshContainer = ShaderContainer (Just meshVertexShader) (Just meshFragmentShader)
|
||||||
textureContainer = ShaderContainer (Just meshVertexShader) (Just textureFragmentShader)
|
|
||||||
createGraphicsPipelines
|
createGraphicsPipelines
|
||||||
vulkanLogicalDevice
|
vulkanLogicalDevice
|
||||||
renderPass
|
renderPass
|
||||||
|
@ -136,32 +115,14 @@ initVulkan window = do
|
||||||
dimensions
|
dimensions
|
||||||
meshLayout
|
meshLayout
|
||||||
(Just (createDepthStencilStateCreateInfo True True Vk.COMPARE_OP_LESS_OR_EQUAL))
|
(Just (createDepthStencilStateCreateInfo True True Vk.COMPARE_OP_LESS_OR_EQUAL))
|
||||||
"defaultMesh"
|
|
||||||
createGraphicsPipelines
|
|
||||||
vulkanLogicalDevice
|
|
||||||
renderPass
|
|
||||||
textureContainer
|
|
||||||
dimensions
|
|
||||||
textureLayout
|
|
||||||
(Just (createDepthStencilStateCreateInfo True True Vk.COMPARE_OP_LESS_OR_EQUAL))
|
|
||||||
"texturedMesh"
|
|
||||||
|
|
||||||
frameBuffers <- createFramebuffer vulkanLogicalDevice renderPass imageViews depthImageView dimensions
|
frameBuffers <- createFramebuffer vulkanLogicalDevice renderPass imageViews depthImageView dimensions
|
||||||
|
|
||||||
(frames, queue) <-
|
(frames, queue) <- createFrames vulkanPhysicalDevice vulkanLogicalDevice allocator descriptorPool descriptorSetLayout1 descriptorSetLayout2
|
||||||
createFrames
|
|
||||||
vulkanLogicalDevice
|
|
||||||
allocator
|
|
||||||
descriptorPool
|
|
||||||
descriptorSetLayout1
|
|
||||||
descriptorSetLayout2
|
|
||||||
queueIndex
|
|
||||||
|
|
||||||
loadMeshes allocator uploadContext queue vulkanLogicalDevice
|
loadMeshes allocator
|
||||||
|
|
||||||
loadImages allocator uploadContext queue vulkanLogicalDevice
|
initScene
|
||||||
|
|
||||||
initScene vulkanLogicalDevice descriptorPool textureDescriptorSetLayout
|
|
||||||
|
|
||||||
return $ EngineData
|
return $ EngineData
|
||||||
window
|
window
|
||||||
|
@ -180,7 +141,6 @@ initVulkan window = do
|
||||||
frames
|
frames
|
||||||
descriptorSetLayout1
|
descriptorSetLayout1
|
||||||
descriptorSetLayout2
|
descriptorSetLayout2
|
||||||
textureDescriptorSetLayout
|
|
||||||
descriptorPool
|
descriptorPool
|
||||||
(GPUSceneData
|
(GPUSceneData
|
||||||
(V4 0 0 0 0)
|
(V4 0 0 0 0)
|
||||||
|
@ -189,19 +149,13 @@ initVulkan window = do
|
||||||
(V4 0 0 0 0)
|
(V4 0 0 0 0)
|
||||||
(V4 0 0 0 0)
|
(V4 0 0 0 0)
|
||||||
)
|
)
|
||||||
uploadContext
|
|
||||||
|
|
||||||
|
|
||||||
initScene
|
initScene :: (MonadReader ReadState m, MonadIO m) => m ()
|
||||||
:: (MonadReader ReadState m, MonadIO m, MonadResource m)
|
initScene = do
|
||||||
=> Vk.Device
|
|
||||||
-> Vk.DescriptorPool
|
|
||||||
-> Vk.DescriptorSetLayout
|
|
||||||
-> m ()
|
|
||||||
initScene device descriptorPool texturedSetLayout = do
|
|
||||||
let catMask = RenderObject
|
let catMask = RenderObject
|
||||||
{ objectMesh = "mask"
|
{ objectMesh = "mask"
|
||||||
, objectMaterial = "texturedMesh"
|
, objectMaterial = "defaultMesh"
|
||||||
, objectMatrix = identity
|
, objectMatrix = identity
|
||||||
}
|
}
|
||||||
triangles = V.concatMap
|
triangles = V.concatMap
|
||||||
|
@ -228,51 +182,10 @@ initScene device descriptorPool texturedSetLayout = do
|
||||||
void $ liftIO $ STM.atomically $ STM.swapTMVar renderableContainer $
|
void $ liftIO $ STM.atomically $ STM.swapTMVar renderableContainer $
|
||||||
(renderableVector `V.snoc` catMask) V.++ triangles
|
(renderableVector `V.snoc` catMask) V.++ triangles
|
||||||
|
|
||||||
let samplerInfo = samplerCreateInfo Vk.FILTER_NEAREST Vk.SAMPLER_ADDRESS_MODE_REPEAT
|
|
||||||
blockySampler <- snd <$> Vk.withSampler device samplerInfo Nothing allocate
|
|
||||||
|
|
||||||
matLibraryContainer <- asks materialLibrary
|
|
||||||
texturedMaterial <- do
|
|
||||||
matLibrary <- liftIO $ STM.atomically $ STM.readTMVar matLibraryContainer
|
|
||||||
return (fromMaybe (error "not texturedMesh") $ matLibrary M.!? "texturedMesh")
|
|
||||||
|
|
||||||
let allocInfo = Vk.zero
|
|
||||||
{ Vk.descriptorPool = descriptorPool
|
|
||||||
, Vk.setLayouts = V.singleton texturedSetLayout
|
|
||||||
}
|
|
||||||
|
|
||||||
texturedDescriptorSet <- V.head . snd <$> Vk.withDescriptorSets device allocInfo allocate
|
|
||||||
|
|
||||||
liftIO $ do
|
|
||||||
matLibrary <- STM.atomically $ STM.readTMVar matLibraryContainer
|
|
||||||
let material = texturedMaterial
|
|
||||||
{ materialTextureSet = texturedDescriptorSet
|
|
||||||
}
|
|
||||||
newMatLibrary = M.insert "texturedMesh" material matLibrary
|
|
||||||
void $ STM.atomically $ STM.swapTMVar matLibraryContainer newMatLibrary
|
|
||||||
|
|
||||||
textureContainer <- asks textureLibrary
|
|
||||||
texture <- do
|
|
||||||
texLibrary <- liftIO $ STM.atomically $ STM.readTMVar textureContainer
|
|
||||||
return $ fromMaybe (error "no marksman texture found") $ texLibrary M.!? "marksman"
|
|
||||||
|
|
||||||
let imageBufferInfo = Vk.zero
|
|
||||||
{ Vk.sampler = blockySampler
|
|
||||||
, Vk.imageView = textureImageView texture
|
|
||||||
, Vk.imageLayout = Vk.IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL
|
|
||||||
}
|
|
||||||
texture1 = V.singleton $ Vk.SomeStruct $ writeDescriptorImage
|
|
||||||
Vk.DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER
|
|
||||||
texturedDescriptorSet
|
|
||||||
imageBufferInfo
|
|
||||||
0
|
|
||||||
|
|
||||||
Vk.updateDescriptorSets device texture1 V.empty
|
|
||||||
|
|
||||||
initDescriptors
|
initDescriptors
|
||||||
:: (MonadResource m)
|
:: (MonadResource m)
|
||||||
=> Vk.Device
|
=> Vk.Device
|
||||||
-> m (Vk.DescriptorSetLayout, Vk.DescriptorSetLayout, Vk.DescriptorSetLayout, Vk.DescriptorPool)
|
-> m (Vk.DescriptorSetLayout, Vk.DescriptorSetLayout, Vk.DescriptorPool)
|
||||||
initDescriptors device = do
|
initDescriptors device = do
|
||||||
let cameraBind = descriptorsetLayoutBinding
|
let cameraBind = descriptorsetLayoutBinding
|
||||||
Vk.DESCRIPTOR_TYPE_UNIFORM_BUFFER
|
Vk.DESCRIPTOR_TYPE_UNIFORM_BUFFER
|
||||||
|
@ -286,10 +199,6 @@ initDescriptors device = do
|
||||||
Vk.DESCRIPTOR_TYPE_STORAGE_BUFFER
|
Vk.DESCRIPTOR_TYPE_STORAGE_BUFFER
|
||||||
Vk.SHADER_STAGE_VERTEX_BIT
|
Vk.SHADER_STAGE_VERTEX_BIT
|
||||||
0
|
0
|
||||||
textureBind = descriptorsetLayoutBinding
|
|
||||||
Vk.DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER
|
|
||||||
Vk.SHADER_STAGE_FRAGMENT_BIT
|
|
||||||
0
|
|
||||||
setInfo = Vk.zero
|
setInfo = Vk.zero
|
||||||
{ Vk.flags = Vk.DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT
|
{ Vk.flags = Vk.DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT
|
||||||
, Vk.bindings = V.fromList
|
, Vk.bindings = V.fromList
|
||||||
|
@ -301,14 +210,8 @@ initDescriptors device = do
|
||||||
{ Vk.flags = Vk.DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT
|
{ Vk.flags = Vk.DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT
|
||||||
, Vk.bindings = V.singleton objectBind
|
, Vk.bindings = V.singleton objectBind
|
||||||
}
|
}
|
||||||
setInfo3 = Vk.zero
|
|
||||||
{ Vk.flags = Vk.DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT
|
|
||||||
, Vk.bindings = V.singleton textureBind
|
|
||||||
}
|
|
||||||
poolInfo = Vk.zero
|
poolInfo = Vk.zero
|
||||||
{ Vk.flags =
|
{ Vk.flags = Vk.DESCRIPTOR_POOL_CREATE_UPDATE_AFTER_BIND_BIT
|
||||||
Vk.DESCRIPTOR_POOL_CREATE_UPDATE_AFTER_BIND_BIT .|.
|
|
||||||
Vk.DESCRIPTOR_POOL_CREATE_FREE_DESCRIPTOR_SET_BIT
|
|
||||||
, Vk.maxSets = 10
|
, Vk.maxSets = 10
|
||||||
, Vk.poolSizes = V.fromList
|
, Vk.poolSizes = V.fromList
|
||||||
[ Vk.zero
|
[ Vk.zero
|
||||||
|
@ -323,10 +226,6 @@ initDescriptors device = do
|
||||||
{ Vk.type' = Vk.DESCRIPTOR_TYPE_STORAGE_BUFFER
|
{ Vk.type' = Vk.DESCRIPTOR_TYPE_STORAGE_BUFFER
|
||||||
, Vk.descriptorCount = 10
|
, Vk.descriptorCount = 10
|
||||||
}
|
}
|
||||||
, Vk.zero
|
|
||||||
{ Vk.type' = Vk.DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER
|
|
||||||
, Vk.descriptorCount = 10
|
|
||||||
}
|
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -336,10 +235,7 @@ initDescriptors device = do
|
||||||
(_, descriptorSetLayout2) <-
|
(_, descriptorSetLayout2) <-
|
||||||
Vk.withDescriptorSetLayout device setInfo2 Nothing allocate
|
Vk.withDescriptorSetLayout device setInfo2 Nothing allocate
|
||||||
|
|
||||||
(_, textureDescriptorSetLayout) <-
|
|
||||||
Vk.withDescriptorSetLayout device setInfo3 Nothing allocate
|
|
||||||
|
|
||||||
(_, descriptorPool) <-
|
(_, descriptorPool) <-
|
||||||
Vk.withDescriptorPool device poolInfo Nothing allocate
|
Vk.withDescriptorPool device poolInfo Nothing allocate
|
||||||
|
|
||||||
return (descriptorSetLayout1, descriptorSetLayout2, textureDescriptorSetLayout, descriptorPool)
|
return (descriptorSetLayout1, descriptorSetLayout2, descriptorPool)
|
||||||
|
|
31
src/Main.hs
31
src/Main.hs
|
@ -1,8 +1,6 @@
|
||||||
{-# LANGUAGE OverloadedStrings #-}
|
{-# LANGUAGE OverloadedStrings #-}
|
||||||
{-# LANGUAGE OverloadedRecordDot #-}
|
|
||||||
{-# LANGUAGE DuplicateRecordFields #-}
|
{-# LANGUAGE DuplicateRecordFields #-}
|
||||||
{-# LANGUAGE DataKinds #-}
|
{-# LANGUAGE DataKinds #-}
|
||||||
{-# LANGUAGE OverloadedRecordDot #-}
|
|
||||||
module Main where
|
module Main where
|
||||||
|
|
||||||
import qualified Control.Concurrent.STM as STM
|
import qualified Control.Concurrent.STM as STM
|
||||||
|
@ -11,12 +9,10 @@ import Control.Monad.Loops
|
||||||
import Control.Monad.IO.Class
|
import Control.Monad.IO.Class
|
||||||
import Control.Monad.Trans.Resource
|
import Control.Monad.Trans.Resource
|
||||||
import Data.Bits
|
import Data.Bits
|
||||||
import Data.ByteString.Char8
|
|
||||||
import qualified Data.Map.Strict as M
|
import qualified Data.Map.Strict as M
|
||||||
import Data.Time.Clock
|
|
||||||
import qualified Data.Vector as V
|
import qualified Data.Vector as V
|
||||||
|
import Data.Word
|
||||||
import qualified SDL hiding (V2)
|
import qualified SDL hiding (V2)
|
||||||
import System.IO (stdout)
|
|
||||||
import System.Mem
|
import System.Mem
|
||||||
import qualified Vulkan as Vk
|
import qualified Vulkan as Vk
|
||||||
import qualified Vulkan.Zero as Vk
|
import qualified Vulkan.Zero as Vk
|
||||||
|
@ -32,13 +28,11 @@ main = do
|
||||||
renderablesContainer <- STM.newTMVarIO (V.empty)
|
renderablesContainer <- STM.newTMVarIO (V.empty)
|
||||||
meshMap <- STM.newTMVarIO (M.empty)
|
meshMap <- STM.newTMVarIO (M.empty)
|
||||||
materialMap <- STM.newTMVarIO (M.empty)
|
materialMap <- STM.newTMVarIO (M.empty)
|
||||||
textureMap <- STM.newTMVarIO (M.empty)
|
|
||||||
frameNumber <- STM.newTMVarIO 0
|
frameNumber <- STM.newTMVarIO 0
|
||||||
let initState = ReadState
|
let initState = ReadState
|
||||||
{ renderables = renderablesContainer
|
{ renderables = renderablesContainer
|
||||||
, meshLibrary = meshMap
|
, meshLibrary = meshMap
|
||||||
, materialLibrary = materialMap
|
, materialLibrary = materialMap
|
||||||
, textureLibrary = textureMap
|
|
||||||
}
|
}
|
||||||
runRender initState $ do
|
runRender initState $ do
|
||||||
engineData <- initEngine
|
engineData <- initEngine
|
||||||
|
@ -47,8 +41,6 @@ main = do
|
||||||
|
|
||||||
-- create abort condition for upcoming lop
|
-- create abort condition for upcoming lop
|
||||||
quit <- liftIO $ STM.newTMVarIO True
|
quit <- liftIO $ STM.newTMVarIO True
|
||||||
time <- liftIO $ STM.newTMVarIO =<< getCurrentTime
|
|
||||||
average <- liftIO $ STM.newTMVarIO 0
|
|
||||||
|
|
||||||
-- main loop
|
-- main loop
|
||||||
whileM_
|
whileM_
|
||||||
|
@ -56,24 +48,11 @@ main = do
|
||||||
)
|
)
|
||||||
( do
|
( do
|
||||||
liftIO performMajorGC
|
liftIO performMajorGC
|
||||||
now <- liftIO getCurrentTime
|
|
||||||
before <- liftIO $ STM.atomically $ STM.swapTMVar time now
|
|
||||||
let timeDiff = diffUTCTime now before
|
|
||||||
fps = recip $ nominalDiffTimeToSeconds timeDiff
|
|
||||||
liftIO $ hPutStr stdout $ pack $ "Current FPS: " <> show (floor fps) <> " \r"
|
|
||||||
number <- liftIO $ STM.atomically $ do
|
number <- liftIO $ STM.atomically $ do
|
||||||
number <- STM.readTMVar frameNumber
|
number <- STM.readTMVar frameNumber
|
||||||
if number == 0 then
|
|
||||||
void $ STM.swapTMVar average fps
|
|
||||||
else do
|
|
||||||
oldAverage <- STM.readTMVar average
|
|
||||||
let newAverage = (oldAverage * fromIntegral number + fps) / frameCount
|
|
||||||
frameCount = fromIntegral number + 1
|
|
||||||
void $ STM.swapTMVar average newAverage
|
|
||||||
void $ STM.swapTMVar frameNumber (succ number)
|
void $ STM.swapTMVar frameNumber (succ number)
|
||||||
return number
|
return number
|
||||||
-- draw
|
-- draw
|
||||||
-- liftIO $ putStr $ show (recip $ nominalDiffTimeToSeconds timeDiff) <> "\r"
|
|
||||||
drawFrame engineData number
|
drawFrame engineData number
|
||||||
-- poll events
|
-- poll events
|
||||||
evs <- liftIO SDL.pollEvents
|
evs <- liftIO SDL.pollEvents
|
||||||
|
@ -87,12 +66,6 @@ main = do
|
||||||
evs
|
evs
|
||||||
)
|
)
|
||||||
|
|
||||||
fps <- liftIO $ STM.atomically $ STM.readTMVar average
|
|
||||||
|
|
||||||
liftIO $ hPutStr stdout $
|
|
||||||
"\n" <>
|
|
||||||
"Average FPS: " <> pack (show fps) <> "\n"
|
|
||||||
|
|
||||||
Vk.deviceWaitIdle $ engineLogicalDevice engineData
|
Vk.deviceWaitIdle $ engineLogicalDevice engineData
|
||||||
|
|
||||||
createBufferView
|
createBufferView
|
||||||
|
@ -128,7 +101,7 @@ allocateMemory logicalDevice buffer = do
|
||||||
memoryRequirements <- Vk.getBufferMemoryRequirements logicalDevice buffer
|
memoryRequirements <- Vk.getBufferMemoryRequirements logicalDevice buffer
|
||||||
|
|
||||||
let memoryAllocateInfo = Vk.zero
|
let memoryAllocateInfo = Vk.zero
|
||||||
{ Vk.allocationSize = memoryRequirements.size
|
{ Vk.allocationSize = (Vk.size :: Vk.MemoryRequirements -> Word64) memoryRequirements
|
||||||
, Vk.memoryTypeIndex = error ("createBuffer: TODO: populate memoryTypeIndex!" :: String)
|
, Vk.memoryTypeIndex = error ("createBuffer: TODO: populate memoryTypeIndex!" :: String)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
|
{-# LANGUAGE OverloadedStrings #-}
|
||||||
{-# LANGUAGE DuplicateRecordFields #-}
|
{-# LANGUAGE DuplicateRecordFields #-}
|
||||||
{-# LANGUAGE DataKinds #-}
|
{-# LANGUAGE DataKinds #-}
|
||||||
{-# LANGUAGE OverloadedRecordDot #-}
|
|
||||||
|
|
||||||
module Memory where
|
module Memory where
|
||||||
|
|
||||||
import Control.Monad.IO.Class
|
import Control.Monad.IO.Class
|
||||||
|
@ -28,9 +27,9 @@ initAllocator
|
||||||
-> m VMA.Allocator
|
-> m VMA.Allocator
|
||||||
initAllocator physicalDevice device instance' = do
|
initAllocator physicalDevice device instance' = do
|
||||||
let instanceProcAddr = castFunPtr $
|
let instanceProcAddr = castFunPtr $
|
||||||
Vk.pVkGetInstanceProcAddr (instance'.instanceCmds)
|
Vk.pVkGetInstanceProcAddr ((Vk.instanceCmds :: Vk.Instance -> Vk.InstanceCmds) instance')
|
||||||
deviceProcAddr = castFunPtr $
|
deviceProcAddr = castFunPtr $
|
||||||
Vk.pVkGetDeviceProcAddr (device.deviceCmds)
|
Vk.pVkGetDeviceProcAddr ((Vk.deviceCmds :: Vk.Device -> Vk.DeviceCmds) device)
|
||||||
let allocatorInfo = Vk.zero
|
let allocatorInfo = Vk.zero
|
||||||
{ VMA.physicalDevice = Vk.physicalDeviceHandle physicalDevice
|
{ VMA.physicalDevice = Vk.physicalDeviceHandle physicalDevice
|
||||||
, VMA.device = Vk.deviceHandle device
|
, VMA.device = Vk.deviceHandle device
|
||||||
|
|
166
src/Mesh.hs
166
src/Mesh.hs
|
@ -1,7 +1,6 @@
|
||||||
{-# LANGUAGE OverloadedStrings #-}
|
{-# LANGUAGE OverloadedStrings #-}
|
||||||
{-# LANGUAGE DuplicateRecordFields #-}
|
{-# LANGUAGE DuplicateRecordFields #-}
|
||||||
{-# LANGUAGE DataKinds #-}
|
{-# LANGUAGE DataKinds #-}
|
||||||
{-# LANGUAGE FlexibleContexts #-}
|
|
||||||
module Mesh where
|
module Mesh where
|
||||||
|
|
||||||
import Codec.Wavefront
|
import Codec.Wavefront
|
||||||
|
@ -9,16 +8,15 @@ import Codec.Wavefront
|
||||||
import qualified Control.Concurrent.STM as STM
|
import qualified Control.Concurrent.STM as STM
|
||||||
import qualified Control.Monad as CM (void)
|
import qualified Control.Monad as CM (void)
|
||||||
import Control.Monad.IO.Class
|
import Control.Monad.IO.Class
|
||||||
import Control.Monad.Reader
|
import Control.Monad.Reader (asks)
|
||||||
import Control.Monad.Trans.Resource
|
import Control.Monad.Trans.Resource
|
||||||
|
|
||||||
import qualified Data.Map.Strict as M
|
import qualified Data.Map.Strict as M
|
||||||
import Data.Maybe (fromMaybe)
|
|
||||||
import qualified Data.Vector as V
|
import qualified Data.Vector as V
|
||||||
|
|
||||||
import Foreign
|
import Foreign
|
||||||
|
|
||||||
import Linear (V2(..), V3(..), V4(..))
|
import Linear (V3(..), V4(..))
|
||||||
|
|
||||||
import qualified VulkanMemoryAllocator as VMA
|
import qualified VulkanMemoryAllocator as VMA
|
||||||
import qualified Vulkan.Core10 as Vk
|
import qualified Vulkan.Core10 as Vk
|
||||||
|
@ -27,29 +25,19 @@ import qualified Vulkan.Zero as Vk
|
||||||
-- internal imports
|
-- internal imports
|
||||||
|
|
||||||
import Types
|
import Types
|
||||||
import Sync
|
|
||||||
|
|
||||||
loadMeshes
|
loadMeshes
|
||||||
:: (MonadReader ReadState m, MonadResource m, MonadFail m)
|
:: VMA.Allocator
|
||||||
=> VMA.Allocator
|
-> Render ()
|
||||||
-> UploadContext
|
loadMeshes allocator = do
|
||||||
-> Vk.Queue
|
|
||||||
-> Vk.Device
|
|
||||||
-> m ()
|
|
||||||
loadMeshes allocator uploadContext queue device = do
|
|
||||||
let triangle = V.fromList
|
let triangle = V.fromList
|
||||||
[ Vertex (V3 0.5 0 0) (V3 0 0 0) (V4 0 1 0 1) (V2 0 0)
|
[ Vertex (V3 0.5 0.5 0) (V3 0 0 0) (V4 0 1 0 1)
|
||||||
, Vertex (V3 (-0.5) 0 0) (V3 0 0 0) (V4 0 1 0 1) (V2 0 0)
|
, Vertex (V3 (-0.5) 0.5 0) (V3 0 0 0) (V4 0 1 0 1)
|
||||||
, Vertex (V3 0 1 0) (V3 0 0 0) (V4 0 1 0 1) (V2 0 0)
|
, Vertex (V3 0 (-0.5) 0) (V3 0 0 0) (V4 0 1 0 1)
|
||||||
]
|
]
|
||||||
|
|
||||||
triMesh <- uploadMesh triangle allocator uploadContext queue device
|
triMesh <- uploadMesh triangle allocator
|
||||||
maskMesh <- loadFromObj
|
maskMesh <- loadFromObj "./assets/cat_mask_cyberpunk.obj" allocator
|
||||||
"./assets/models/jaeger.obj"
|
|
||||||
allocator
|
|
||||||
uploadContext
|
|
||||||
queue
|
|
||||||
device
|
|
||||||
|
|
||||||
meshLib <- asks meshLibrary
|
meshLib <- asks meshLibrary
|
||||||
|
|
||||||
|
@ -64,75 +52,30 @@ uploadMesh
|
||||||
:: (MonadResource m, MonadFail m)
|
:: (MonadResource m, MonadFail m)
|
||||||
=> V.Vector Vertex
|
=> V.Vector Vertex
|
||||||
-> VMA.Allocator
|
-> VMA.Allocator
|
||||||
-> UploadContext
|
|
||||||
-> Vk.Queue
|
|
||||||
-> Vk.Device
|
|
||||||
-> m Mesh
|
-> m Mesh
|
||||||
uploadMesh vertices allocator uploadContext queue device = do
|
uploadMesh vertices allocator = do
|
||||||
|
let bufferCreateInfo = Vk.zero
|
||||||
let bufferSize = fromIntegral $ V.length vertices * sizeOf (undefined :: Vertex)
|
{ Vk.size = fromIntegral $
|
||||||
stagingBufferCrateInfo = Vk.zero
|
V.length vertices * sizeOf (Vertex (V3 0 0 0) (V3 0 0 0 ) (V4 0 0 0 0))
|
||||||
{ Vk.size = bufferSize
|
, Vk.usage = Vk.BUFFER_USAGE_VERTEX_BUFFER_BIT
|
||||||
, Vk.usage = Vk.BUFFER_USAGE_TRANSFER_SRC_BIT
|
|
||||||
}
|
|
||||||
stagingAllocationCreateInfo = Vk.zero
|
|
||||||
{ VMA.usage = VMA.MEMORY_USAGE_CPU_ONLY
|
|
||||||
} :: VMA.AllocationCreateInfo
|
|
||||||
|
|
||||||
(stagingReleaseKey, stagingBuffer) <- do
|
|
||||||
(releaseKey, (buffer, bAllocation, bInfo)) <-
|
|
||||||
VMA.withBuffer allocator stagingBufferCrateInfo stagingAllocationCreateInfo allocate
|
|
||||||
return (releaseKey, AllocatedBuffer
|
|
||||||
{ bufferInfo = bInfo
|
|
||||||
, bufferAllocation = bAllocation
|
|
||||||
, allocatedBuffer = buffer
|
|
||||||
})
|
|
||||||
|
|
||||||
(dataReleaseKey, dataPtr) <-
|
|
||||||
VMA.withMappedMemory allocator (bufferAllocation stagingBuffer) allocate
|
|
||||||
|
|
||||||
liftIO $ V.mapM_ (\(idx, vertex) ->
|
|
||||||
poke
|
|
||||||
(castPtr dataPtr `plusPtr` (idx * sizeOf vertex))
|
|
||||||
vertex
|
|
||||||
)
|
|
||||||
(V.zip
|
|
||||||
(V.fromList [0..])
|
|
||||||
vertices
|
|
||||||
)
|
|
||||||
|
|
||||||
liftIO $ release dataReleaseKey
|
|
||||||
|
|
||||||
let vertexBufferCreateInfo = Vk.zero
|
|
||||||
{ Vk.size = bufferSize
|
|
||||||
, Vk.usage = Vk.BUFFER_USAGE_VERTEX_BUFFER_BIT .|. Vk.BUFFER_USAGE_TRANSFER_DST_BIT
|
|
||||||
}
|
}
|
||||||
allocationCreateInfo = Vk.zero
|
allocationCreateInfo = Vk.zero
|
||||||
{ VMA.usage = VMA.MEMORY_USAGE_GPU_ONLY
|
{ VMA.usage = VMA.MEMORY_USAGE_CPU_TO_GPU
|
||||||
} :: VMA.AllocationCreateInfo
|
} :: VMA.AllocationCreateInfo
|
||||||
|
|
||||||
mesh <- do
|
mesh <- do
|
||||||
(buffer, bAllocation, bInfo) <- snd <$>
|
(buffer, bAllocation, bInfo) <- snd <$>
|
||||||
VMA.withBuffer allocator vertexBufferCreateInfo allocationCreateInfo allocate
|
VMA.withBuffer allocator bufferCreateInfo allocationCreateInfo allocate
|
||||||
return $ Mesh
|
return (Mesh vertices (AllocatedBuffer buffer bAllocation bInfo))
|
||||||
{ meshVertices = vertices
|
|
||||||
, meshBuffer = AllocatedBuffer
|
|
||||||
{ bufferInfo = bInfo
|
|
||||||
, bufferAllocation = bAllocation
|
|
||||||
, allocatedBuffer = buffer
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
immediateSubmit uploadContext queue device$ \cmd -> do
|
(dataReleaseKey, dataPtr) <-
|
||||||
let copy = V.singleton $ Vk.BufferCopy
|
VMA.withMappedMemory allocator (bufferAllocation $ meshBuffer mesh) allocate
|
||||||
{ size = bufferSize
|
|
||||||
, dstOffset = 0
|
|
||||||
, srcOffset = 0
|
|
||||||
}
|
|
||||||
|
|
||||||
Vk.cmdCopyBuffer cmd (allocatedBuffer stagingBuffer) (allocatedBuffer $ meshBuffer mesh) copy
|
liftIO $ mapM_ (\(idx, vertex) ->
|
||||||
|
poke (castPtr (dataPtr `plusPtr` (idx * sizeOf vertex))) vertex
|
||||||
|
)
|
||||||
|
(zip [0..] (V.toList vertices))
|
||||||
|
|
||||||
release stagingReleaseKey
|
release dataReleaseKey
|
||||||
|
|
||||||
return mesh
|
return mesh
|
||||||
|
|
||||||
|
@ -140,22 +83,18 @@ loadFromObj
|
||||||
:: (MonadResource m, MonadFail m)
|
:: (MonadResource m, MonadFail m)
|
||||||
=> FilePath
|
=> FilePath
|
||||||
-> VMA.Allocator
|
-> VMA.Allocator
|
||||||
-> UploadContext
|
|
||||||
-> Vk.Queue
|
|
||||||
-> Vk.Device
|
|
||||||
-> m Mesh
|
-> m Mesh
|
||||||
loadFromObj filepath vma uploadContext queue device = do
|
loadFromObj filepath vma = do
|
||||||
eitherObj <- liftIO $ fromFile filepath
|
eitherObj <- liftIO $ fromFile filepath
|
||||||
case eitherObj of
|
case eitherObj of
|
||||||
Left err ->
|
Left err ->
|
||||||
error ("loadFromObj: loading mesh data: " <> err)
|
error ("loadFromObj: loading mesh data: " <> err)
|
||||||
Right obj -> do
|
Right obj -> do
|
||||||
let vertices = digestFaces (objFaces obj) (objLocations obj) (objTexCoords obj)
|
let vertices = digestFaces (objFaces obj) (objLocations obj)
|
||||||
uploadMesh vertices vma uploadContext queue device
|
uploadMesh vertices vma
|
||||||
where
|
where
|
||||||
digestFaces
|
digestFaces :: V.Vector (Element Face) -> V.Vector Location -> V.Vector Vertex
|
||||||
:: V.Vector (Element Face) -> V.Vector Location -> V.Vector TexCoord -> V.Vector Vertex
|
digestFaces faces locations =
|
||||||
digestFaces faces locations texCoords =
|
|
||||||
V.foldl
|
V.foldl
|
||||||
(\acc (Element _ _ _ _ (Face fa fb fc others)) ->
|
(\acc (Element _ _ _ _ (Face fa fb fc others)) ->
|
||||||
if not (null others)
|
if not (null others)
|
||||||
|
@ -167,9 +106,8 @@ loadFromObj filepath vma uploadContext queue device = do
|
||||||
let position = faceIndexToPosition faceIndex locations
|
let position = faceIndexToPosition faceIndex locations
|
||||||
normal = V3 0 0 0
|
normal = V3 0 0 0
|
||||||
color = V4 1 1 0 1
|
color = V4 1 1 0 1
|
||||||
uv = faceIndexToUV faceIndex texCoords
|
|
||||||
in
|
in
|
||||||
Vertex position normal color uv
|
Vertex position normal color
|
||||||
)
|
)
|
||||||
(V.fromList [ fa, fb, fc ])
|
(V.fromList [ fa, fb, fc ])
|
||||||
in
|
in
|
||||||
|
@ -182,45 +120,3 @@ loadFromObj filepath vma uploadContext queue device = do
|
||||||
let Location x y z _ = locations V.! (faceLocIndex index - 1)
|
let Location x y z _ = locations V.! (faceLocIndex index - 1)
|
||||||
in
|
in
|
||||||
V3 x y z
|
V3 x y z
|
||||||
faceIndexToUV :: FaceIndex -> V.Vector TexCoord -> V2 Float
|
|
||||||
faceIndexToUV index texCoords =
|
|
||||||
let TexCoord r s _ =
|
|
||||||
texCoords V.!
|
|
||||||
(fromMaybe (error "no UV coordinates present") (faceTexCoordIndex index) - 1)
|
|
||||||
in
|
|
||||||
-- flip V coordinate of UVs to fix display
|
|
||||||
V2 r (-s)
|
|
||||||
|
|
||||||
compactDraws
|
|
||||||
:: M.Map String Mesh
|
|
||||||
-> M.Map String Material
|
|
||||||
-> V.Vector RenderObject
|
|
||||||
-> V.Vector IndirectBatch
|
|
||||||
compactDraws meshLib materialLib objects =
|
|
||||||
|
|
||||||
V.foldl
|
|
||||||
(\acc (index, RenderObject mesh material _) ->
|
|
||||||
|
|
||||||
let newDraw = IndirectBatch
|
|
||||||
{ batchMesh = meshLib M.! mesh
|
|
||||||
, batchMaterial = materialLib M.! material
|
|
||||||
, batchFirst = index
|
|
||||||
, batchCount = 1
|
|
||||||
}
|
|
||||||
sameMesh = not (V.null acc) && (meshLib M.! mesh == batchMesh (V.last acc))
|
|
||||||
sameMaterial = not (V.null acc) && (materialLib M.! material == batchMaterial (V.last acc))
|
|
||||||
|
|
||||||
in
|
|
||||||
if sameMesh && sameMaterial
|
|
||||||
then
|
|
||||||
V.init acc `V.snoc` ((V.last acc)
|
|
||||||
{ batchCount = batchCount (V.last acc) + 1
|
|
||||||
})
|
|
||||||
else
|
|
||||||
acc `V.snoc` newDraw
|
|
||||||
)
|
|
||||||
V.empty
|
|
||||||
(V.zip
|
|
||||||
(V.fromList [0..])
|
|
||||||
objects
|
|
||||||
)
|
|
||||||
|
|
75
src/Sync.hs
75
src/Sync.hs
|
@ -1,75 +0,0 @@
|
||||||
{-# LANGUAGE OverloadedStrings #-}
|
|
||||||
{-# LANGUAGE DuplicateRecordFields #-}
|
|
||||||
{-# LANGUAGE DataKinds #-}
|
|
||||||
{-# LANGUAGE FlexibleContexts #-}
|
|
||||||
module Sync where
|
|
||||||
|
|
||||||
import Control.Monad.Trans.Resource
|
|
||||||
import Data.Bits (bit)
|
|
||||||
import qualified Data.Vector as V
|
|
||||||
import Data.Word
|
|
||||||
import qualified Vulkan as Vk
|
|
||||||
import qualified Vulkan.Zero as Vk
|
|
||||||
|
|
||||||
-- internal imports
|
|
||||||
|
|
||||||
import Control.Monad.Reader
|
|
||||||
import Types
|
|
||||||
import Util
|
|
||||||
|
|
||||||
initSyncStructures
|
|
||||||
:: (MonadResource m)
|
|
||||||
=> Vk.Device
|
|
||||||
-> Word32
|
|
||||||
-> m UploadContext
|
|
||||||
initSyncStructures logicalDevice queueFamilyIndex = do
|
|
||||||
|
|
||||||
let fenceCreateInfo = Vk.zero
|
|
||||||
|
|
||||||
syncFence <- snd <$>
|
|
||||||
Vk.withFence logicalDevice fenceCreateInfo Nothing allocate
|
|
||||||
|
|
||||||
let uploadCommandPoolCreateInfo = Vk.zero
|
|
||||||
{ Vk.queueFamilyIndex = queueFamilyIndex
|
|
||||||
} :: Vk.CommandPoolCreateInfo
|
|
||||||
|
|
||||||
syncCommandPool <- snd <$>
|
|
||||||
Vk.withCommandPool logicalDevice uploadCommandPoolCreateInfo Nothing allocate
|
|
||||||
|
|
||||||
let cmdBufAllocInfo = Vk.zero
|
|
||||||
{ Vk.commandPool = syncCommandPool
|
|
||||||
, Vk.commandBufferCount = 1
|
|
||||||
}
|
|
||||||
|
|
||||||
syncCommandBuffer <- V.head . snd <$> Vk.withCommandBuffers logicalDevice cmdBufAllocInfo allocate
|
|
||||||
|
|
||||||
return $ UploadContext
|
|
||||||
{ uploadFence = syncFence
|
|
||||||
, uploadCommandBuffer = syncCommandBuffer
|
|
||||||
, uploadCommandPool = syncCommandPool
|
|
||||||
}
|
|
||||||
|
|
||||||
immediateSubmit
|
|
||||||
:: (MonadIO m)
|
|
||||||
=> UploadContext
|
|
||||||
-> Vk.Queue
|
|
||||||
-> Vk.Device
|
|
||||||
-> (Vk.CommandBuffer -> m ())
|
|
||||||
-> m ()
|
|
||||||
immediateSubmit uploadContext queue device func = do
|
|
||||||
|
|
||||||
let cmdBegin = beginCommandBuffer Vk.COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT
|
|
||||||
|
|
||||||
Vk.useCommandBuffer
|
|
||||||
(uploadCommandBuffer uploadContext)
|
|
||||||
cmdBegin
|
|
||||||
(func (uploadCommandBuffer uploadContext))
|
|
||||||
|
|
||||||
let submitInfo = createSubmitInfo (uploadCommandBuffer uploadContext)
|
|
||||||
|
|
||||||
Vk.queueSubmit queue submitInfo (uploadFence uploadContext)
|
|
||||||
|
|
||||||
void $ Vk.waitForFences device (V.singleton $ uploadFence uploadContext) True maxBound
|
|
||||||
Vk.resetFences device (V.singleton $ uploadFence uploadContext)
|
|
||||||
|
|
||||||
Vk.resetCommandPool device (uploadCommandPool uploadContext) (bit 0)
|
|
173
src/Textures.hs
173
src/Textures.hs
|
@ -1,173 +0,0 @@
|
||||||
{-# LANGUAGE FlexibleContexts #-}
|
|
||||||
{-# LANGUAGE DuplicateRecordFields #-}
|
|
||||||
{-# LANGUAGE DataKinds #-}
|
|
||||||
{-# LANGUAGE ScopedTypeVariables #-}
|
|
||||||
module Textures where
|
|
||||||
|
|
||||||
import qualified Codec.Picture as P
|
|
||||||
import Control.Monad.IO.Class
|
|
||||||
import Control.Monad.Reader
|
|
||||||
import Control.Monad.Trans.Resource
|
|
||||||
import qualified Data.Map.Strict as M
|
|
||||||
import qualified Data.Vector as V
|
|
||||||
import qualified Data.Vector.Storable as VS
|
|
||||||
import Foreign hiding (void)
|
|
||||||
import qualified Control.Concurrent.STM as STM
|
|
||||||
import qualified Vulkan as Vk
|
|
||||||
import qualified Vulkan.CStruct.Extends as Vk
|
|
||||||
import qualified Vulkan.Zero as Vk
|
|
||||||
import qualified VulkanMemoryAllocator as VMA
|
|
||||||
|
|
||||||
-- internal imports
|
|
||||||
|
|
||||||
import Types
|
|
||||||
import Memory
|
|
||||||
import Sync
|
|
||||||
import Image
|
|
||||||
|
|
||||||
loadImageFromFile
|
|
||||||
:: (MonadResource m, MonadIO m)
|
|
||||||
=> VMA.Allocator
|
|
||||||
-> UploadContext
|
|
||||||
-> Vk.Queue
|
|
||||||
-> Vk.Device
|
|
||||||
-> FilePath
|
|
||||||
-> m AllocatedImage
|
|
||||||
loadImageFromFile allocator uploadContext queue device file = do
|
|
||||||
|
|
||||||
pixels <- liftIO $ either error P.convertRGBA8 <$> P.readImage file
|
|
||||||
|
|
||||||
let texWidth = P.imageWidth pixels
|
|
||||||
texHeight = P.imageHeight pixels
|
|
||||||
imageSize = 4 * texWidth * texHeight
|
|
||||||
imageFormat = Vk.FORMAT_R8G8B8A8_SRGB
|
|
||||||
|
|
||||||
stagingBuffer <-
|
|
||||||
createAllocatedBuffer
|
|
||||||
allocator
|
|
||||||
imageSize
|
|
||||||
Vk.BUFFER_USAGE_TRANSFER_SRC_BIT
|
|
||||||
VMA.MEMORY_USAGE_CPU_ONLY
|
|
||||||
|
|
||||||
let dataPtr = VMA.mappedData (bufferInfo stagingBuffer)
|
|
||||||
|
|
||||||
liftIO $ pokeArray (castPtr dataPtr) (VS.toList $ P.imageData pixels)
|
|
||||||
|
|
||||||
let imageExtent = Vk.Extent3D
|
|
||||||
{ width = fromIntegral texWidth
|
|
||||||
, height = fromIntegral texHeight
|
|
||||||
, depth = 1
|
|
||||||
}
|
|
||||||
dImgAllocCreateInfo = Vk.zero
|
|
||||||
{ VMA.usage = VMA.MEMORY_USAGE_GPU_ONLY
|
|
||||||
} :: VMA.AllocationCreateInfo
|
|
||||||
dImgCreateInfo = imageCreate
|
|
||||||
imageFormat
|
|
||||||
imageExtent
|
|
||||||
(Vk.IMAGE_USAGE_SAMPLED_BIT .|. Vk.IMAGE_USAGE_TRANSFER_DST_BIT)
|
|
||||||
|
|
||||||
(newImage, newAllocation, _) <- snd <$>
|
|
||||||
VMA.withImage allocator dImgCreateInfo dImgAllocCreateInfo allocate
|
|
||||||
|
|
||||||
immediateSubmit
|
|
||||||
uploadContext
|
|
||||||
queue
|
|
||||||
device
|
|
||||||
(\cmd -> do
|
|
||||||
let range = Vk.zero
|
|
||||||
{ Vk.aspectMask = Vk.IMAGE_ASPECT_COLOR_BIT
|
|
||||||
, Vk.baseMipLevel = 0
|
|
||||||
, Vk.levelCount = 1
|
|
||||||
, Vk.baseArrayLayer = 0
|
|
||||||
, Vk.layerCount = 1
|
|
||||||
}
|
|
||||||
imageBarrierToTransfer = V.singleton $ Vk.SomeStruct (Vk.zero
|
|
||||||
{ Vk.oldLayout = Vk.IMAGE_LAYOUT_UNDEFINED
|
|
||||||
, Vk.newLayout = Vk.IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL
|
|
||||||
, Vk.image = newImage
|
|
||||||
, Vk.subresourceRange = range
|
|
||||||
-- , Vk.srcAccessMask = bit 0
|
|
||||||
, Vk.dstAccessMask = Vk.ACCESS_TRANSFER_WRITE_BIT
|
|
||||||
} :: Vk.ImageMemoryBarrier '[])
|
|
||||||
|
|
||||||
Vk.cmdPipelineBarrier
|
|
||||||
cmd
|
|
||||||
Vk.PIPELINE_STAGE_TOP_OF_PIPE_BIT
|
|
||||||
Vk.PIPELINE_STAGE_TRANSFER_BIT
|
|
||||||
(bit 0)
|
|
||||||
V.empty
|
|
||||||
V.empty
|
|
||||||
imageBarrierToTransfer
|
|
||||||
|
|
||||||
let copyRegion = V.singleton (Vk.zero
|
|
||||||
{ Vk.bufferOffset = 0
|
|
||||||
, Vk.bufferRowLength = 0
|
|
||||||
, Vk.bufferImageHeight = 0
|
|
||||||
, Vk.imageExtent = imageExtent
|
|
||||||
, Vk.imageSubresource = Vk.zero
|
|
||||||
{ Vk.aspectMask = Vk.IMAGE_ASPECT_COLOR_BIT
|
|
||||||
, Vk.mipLevel = 0
|
|
||||||
, Vk.baseArrayLayer = 0
|
|
||||||
, Vk.layerCount = 1
|
|
||||||
} :: Vk.ImageSubresourceLayers
|
|
||||||
} :: Vk.BufferImageCopy)
|
|
||||||
|
|
||||||
Vk.cmdCopyBufferToImage
|
|
||||||
cmd
|
|
||||||
(allocatedBuffer stagingBuffer)
|
|
||||||
newImage
|
|
||||||
Vk.IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL
|
|
||||||
copyRegion
|
|
||||||
|
|
||||||
let imageBarrierToReadable = V.singleton $ Vk.SomeStruct (Vk.zero
|
|
||||||
{ Vk.oldLayout = Vk.IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL
|
|
||||||
, Vk.newLayout = Vk.IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL
|
|
||||||
, Vk.image = newImage
|
|
||||||
, Vk.subresourceRange = range
|
|
||||||
, Vk.srcAccessMask = Vk.ACCESS_TRANSFER_WRITE_BIT
|
|
||||||
, Vk.dstAccessMask = Vk.ACCESS_SHADER_READ_BIT
|
|
||||||
} :: Vk.ImageMemoryBarrier '[])
|
|
||||||
|
|
||||||
Vk.cmdPipelineBarrier
|
|
||||||
cmd
|
|
||||||
Vk.PIPELINE_STAGE_TRANSFER_BIT
|
|
||||||
Vk.PIPELINE_STAGE_FRAGMENT_SHADER_BIT
|
|
||||||
(bit 0)
|
|
||||||
V.empty
|
|
||||||
V.empty
|
|
||||||
imageBarrierToReadable
|
|
||||||
)
|
|
||||||
|
|
||||||
return $ AllocatedImage
|
|
||||||
{ image = newImage
|
|
||||||
, allocation = newAllocation
|
|
||||||
}
|
|
||||||
|
|
||||||
loadImages
|
|
||||||
:: (MonadResource m, MonadReader ReadState m)
|
|
||||||
=> VMA.Allocator
|
|
||||||
-> UploadContext
|
|
||||||
-> Vk.Queue
|
|
||||||
-> Vk.Device
|
|
||||||
-> m ()
|
|
||||||
loadImages allocator uploadContext queue device = do
|
|
||||||
|
|
||||||
loadedImage <- loadImageFromFile allocator uploadContext queue device "assets/textures/jaeger.texture.tga"
|
|
||||||
|
|
||||||
let imageInfo = imageviewCreate (image loadedImage) Vk.FORMAT_R8G8B8A8_SRGB Vk.IMAGE_ASPECT_COLOR_BIT
|
|
||||||
|
|
||||||
imageView <- snd <$> Vk.withImageView device imageInfo Nothing allocate
|
|
||||||
|
|
||||||
let texture = Texture
|
|
||||||
{ textureImage = loadedImage
|
|
||||||
, textureImageView = imageView
|
|
||||||
}
|
|
||||||
|
|
||||||
textureLib <- asks textureLibrary
|
|
||||||
|
|
||||||
void $ liftIO $ STM.atomically $ do
|
|
||||||
texMap <- STM.readTMVar textureLib
|
|
||||||
|
|
||||||
let newMap = M.insert "marksman" texture texMap
|
|
||||||
|
|
||||||
STM.swapTMVar textureLib newMap
|
|
69
src/Types.hs
69
src/Types.hs
|
@ -40,12 +40,9 @@ data EngineData = EngineData
|
||||||
, engineFrames :: V.Vector FrameData
|
, engineFrames :: V.Vector FrameData
|
||||||
, engineGlobalSetLayout :: Vk.DescriptorSetLayout
|
, engineGlobalSetLayout :: Vk.DescriptorSetLayout
|
||||||
, engineObjectSetLayout :: Vk.DescriptorSetLayout
|
, engineObjectSetLayout :: Vk.DescriptorSetLayout
|
||||||
, engineSingleTextureSetLayout :: Vk.DescriptorSetLayout
|
|
||||||
, engineDescriptorPool :: Vk.DescriptorPool
|
, engineDescriptorPool :: Vk.DescriptorPool
|
||||||
, engineSceneParameters :: GPUSceneData
|
, engineSceneParameters :: GPUSceneData
|
||||||
, engineUploadContext :: UploadContext
|
|
||||||
}
|
}
|
||||||
deriving (Show)
|
|
||||||
|
|
||||||
data AllocatedBuffer = AllocatedBuffer
|
data AllocatedBuffer = AllocatedBuffer
|
||||||
{ allocatedBuffer :: Vk.Buffer
|
{ allocatedBuffer :: Vk.Buffer
|
||||||
|
@ -54,38 +51,28 @@ data AllocatedBuffer = AllocatedBuffer
|
||||||
}
|
}
|
||||||
deriving (Show)
|
deriving (Show)
|
||||||
|
|
||||||
instance Eq AllocatedBuffer where
|
|
||||||
|
|
||||||
(AllocatedBuffer buf1 _ _) == (AllocatedBuffer buf2 _ _) = buf1 == buf2
|
|
||||||
|
|
||||||
data Vertex = Vertex
|
data Vertex = Vertex
|
||||||
{ vertexPosition :: V3 Float
|
{ vertexPosition :: V3 Float
|
||||||
, vertexNormal :: V3 Float
|
, vertexNormal :: V3 Float
|
||||||
, vertexColor :: V4 Float
|
, vertexColor :: V4 Float
|
||||||
, vertexUV :: V2 Float
|
|
||||||
}
|
}
|
||||||
deriving (Show, Eq)
|
deriving (Show)
|
||||||
|
|
||||||
instance Storable Vertex where
|
instance Storable Vertex where
|
||||||
|
|
||||||
sizeOf _ =
|
sizeOf (Vertex position normal color) = sizeOf position + sizeOf normal + sizeOf color
|
||||||
sizeOf (undefined :: V3 Float) * 2 +
|
|
||||||
sizeOf (undefined :: V4 Float) +
|
|
||||||
sizeOf (undefined :: V2 Float)
|
|
||||||
|
|
||||||
peek ptr = do
|
peek ptr = do
|
||||||
pos <- peek (castPtr ptr)
|
pos <- peek (castPtr ptr)
|
||||||
nor <- peek (castPtr ptr `plusPtr` sizeOf pos)
|
nor <- peek (castPtr ptr `plusPtr` sizeOf pos)
|
||||||
col <- peek (castPtr ptr `plusPtr` sizeOf pos `plusPtr` sizeOf nor)
|
col <- peek (castPtr ptr `plusPtr` sizeOf pos `plusPtr` sizeOf nor)
|
||||||
uv <- peek (castPtr ptr `plusPtr` sizeOf pos `plusPtr` sizeOf nor `plusPtr` sizeOf col)
|
return $ Vertex pos nor col
|
||||||
return $ Vertex pos nor col uv
|
|
||||||
|
|
||||||
poke ptr (Vertex position normal color uv) = do
|
poke ptr (Vertex position normal color) = do
|
||||||
let castedV3Ptr = castPtr ptr
|
let castedV3Ptr = castPtr ptr
|
||||||
pokeElemOff castedV3Ptr 0 position
|
pokeElemOff castedV3Ptr 0 position
|
||||||
pokeElemOff castedV3Ptr 1 normal
|
pokeElemOff castedV3Ptr 1 normal
|
||||||
poke (castPtr (ptr `plusPtr` sizeOf position `plusPtr` sizeOf normal)) color
|
poke (castPtr (ptr `plusPtr` sizeOf position `plusPtr` sizeOf normal)) color
|
||||||
poke (castPtr (ptr `plusPtr` sizeOf position `plusPtr` sizeOf normal `plusPtr` sizeOf color)) uv
|
|
||||||
|
|
||||||
alignment _ = 0
|
alignment _ = 0
|
||||||
|
|
||||||
|
@ -119,13 +106,6 @@ instance VertexInputDescribable Vertex where
|
||||||
, Vk.format = Vk.FORMAT_R32G32B32A32_SFLOAT
|
, Vk.format = Vk.FORMAT_R32G32B32A32_SFLOAT
|
||||||
, Vk.offset = fromIntegral (sizeOf (vertexPosition v) + sizeOf (vertexNormal v))
|
, Vk.offset = fromIntegral (sizeOf (vertexPosition v) + sizeOf (vertexNormal v))
|
||||||
} :: Vk.VertexInputAttributeDescription
|
} :: Vk.VertexInputAttributeDescription
|
||||||
uvAttribute = Vk.zero
|
|
||||||
{ Vk.binding = 0
|
|
||||||
, Vk.location = 3
|
|
||||||
, Vk.format = Vk.FORMAT_R32G32_SFLOAT
|
|
||||||
, Vk.offset = fromIntegral $
|
|
||||||
sizeOf (vertexPosition v) + sizeOf (vertexNormal v) + sizeOf (vertexColor v)
|
|
||||||
} :: Vk.VertexInputAttributeDescription
|
|
||||||
in
|
in
|
||||||
VertexInputDescription
|
VertexInputDescription
|
||||||
{ vidBindings = V.fromList [ mainBinding ]
|
{ vidBindings = V.fromList [ mainBinding ]
|
||||||
|
@ -133,7 +113,6 @@ instance VertexInputDescribable Vertex where
|
||||||
[ positionAttribute
|
[ positionAttribute
|
||||||
, normalAttribute
|
, normalAttribute
|
||||||
, colorAttribute
|
, colorAttribute
|
||||||
, uvAttribute
|
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -147,7 +126,7 @@ data Mesh = Mesh
|
||||||
{ meshVertices :: V.Vector Vertex
|
{ meshVertices :: V.Vector Vertex
|
||||||
, meshBuffer :: AllocatedBuffer
|
, meshBuffer :: AllocatedBuffer
|
||||||
}
|
}
|
||||||
deriving (Show, Eq)
|
deriving (Show)
|
||||||
|
|
||||||
data MeshPushConstants = MeshPushConstants
|
data MeshPushConstants = MeshPushConstants
|
||||||
{ meshPushData :: V4 Float
|
{ meshPushData :: V4 Float
|
||||||
|
@ -180,11 +159,10 @@ data AllocatedImage = AllocatedImage
|
||||||
deriving (Show)
|
deriving (Show)
|
||||||
|
|
||||||
data Material = Material
|
data Material = Material
|
||||||
{ materialTextureSet :: Vk.DescriptorSet
|
{ materialPipeline :: Vk.Pipeline
|
||||||
, materialPipeline :: Vk.Pipeline
|
|
||||||
, materialPipelineLayout :: Vk.PipelineLayout
|
, materialPipelineLayout :: Vk.PipelineLayout
|
||||||
}
|
}
|
||||||
deriving (Show, Eq)
|
deriving (Show)
|
||||||
|
|
||||||
data RenderObject = RenderObject
|
data RenderObject = RenderObject
|
||||||
{ objectMesh :: String
|
{ objectMesh :: String
|
||||||
|
@ -193,23 +171,16 @@ data RenderObject = RenderObject
|
||||||
}
|
}
|
||||||
deriving (Show)
|
deriving (Show)
|
||||||
|
|
||||||
data Texture = Texture
|
|
||||||
{ textureImage :: AllocatedImage
|
|
||||||
, textureImageView :: Vk.ImageView
|
|
||||||
}
|
|
||||||
|
|
||||||
data ReadState = ReadState
|
data ReadState = ReadState
|
||||||
{ renderables :: STM.TMVar (V.Vector RenderObject)
|
{ renderables :: STM.TMVar (V.Vector RenderObject)
|
||||||
, meshLibrary :: STM.TMVar (M.Map String Mesh)
|
, meshLibrary :: STM.TMVar (M.Map String Mesh)
|
||||||
, materialLibrary :: STM.TMVar (M.Map String Material)
|
, materialLibrary :: STM.TMVar (M.Map String Material)
|
||||||
, textureLibrary :: STM.TMVar (M.Map String Texture)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
newtype RenderReader rd m a = RenderReader
|
newtype RenderReader rd m a = RenderReader
|
||||||
{ runRenderInner :: RenderInner rd m a
|
{ runRenderInner :: RenderInner rd m a
|
||||||
}
|
}
|
||||||
deriving
|
deriving (Functor, Applicative, Monad, MonadIO, MonadReader rd, MonadResource, MonadFail)
|
||||||
(Functor, Applicative, Monad, MonadIO, MonadReader rd, MonadResource, MonadFail)
|
|
||||||
|
|
||||||
type RenderInner rd m = ReaderT rd m
|
type RenderInner rd m = ReaderT rd m
|
||||||
|
|
||||||
|
@ -227,7 +198,6 @@ data FrameData = FrameData
|
||||||
, frameCameraBuffer :: AllocatedBuffer
|
, frameCameraBuffer :: AllocatedBuffer
|
||||||
, frameSceneBuffer :: AllocatedBuffer
|
, frameSceneBuffer :: AllocatedBuffer
|
||||||
, frameObjectBuffer :: AllocatedBuffer
|
, frameObjectBuffer :: AllocatedBuffer
|
||||||
, frameIndirectBuffer :: AllocatedBuffer
|
|
||||||
, frameGlobalDescriptor :: Vk.DescriptorSet
|
, frameGlobalDescriptor :: Vk.DescriptorSet
|
||||||
, frameObjectDescriptor :: Vk.DescriptorSet
|
, frameObjectDescriptor :: Vk.DescriptorSet
|
||||||
}
|
}
|
||||||
|
@ -250,7 +220,7 @@ instance Storable GPUObjectData where
|
||||||
GPUObjectData <$> peek (castPtr ptr)
|
GPUObjectData <$> peek (castPtr ptr)
|
||||||
|
|
||||||
poke ptr (GPUObjectData modelMatrix) =
|
poke ptr (GPUObjectData modelMatrix) =
|
||||||
poke (castPtr ptr) $ transpose modelMatrix
|
poke (castPtr ptr) modelMatrix
|
||||||
|
|
||||||
data GPUCameraData = GPUCameraData
|
data GPUCameraData = GPUCameraData
|
||||||
{ view :: M44 Float
|
{ view :: M44 Float
|
||||||
|
@ -272,10 +242,9 @@ instance Storable GPUCameraData where
|
||||||
return $ GPUCameraData v p vp
|
return $ GPUCameraData v p vp
|
||||||
|
|
||||||
poke ptr (GPUCameraData pview pprojection pviewProjection) = do
|
poke ptr (GPUCameraData pview pprojection pviewProjection) = do
|
||||||
poke (castPtr ptr) $ transpose pview
|
poke (castPtr ptr) pview
|
||||||
poke (castPtr ptr `plusPtr` sizeOf pview) $ transpose pprojection
|
poke (castPtr ptr `plusPtr` sizeOf pview) pprojection
|
||||||
poke (castPtr ptr `plusPtr` sizeOf pview `plusPtr` sizeOf pprojection) $
|
poke (castPtr ptr `plusPtr` sizeOf pview `plusPtr` sizeOf pprojection) pviewProjection
|
||||||
transpose pviewProjection
|
|
||||||
|
|
||||||
data GPUSceneData = GPUSceneData
|
data GPUSceneData = GPUSceneData
|
||||||
{ fogColor :: V4 Float
|
{ fogColor :: V4 Float
|
||||||
|
@ -315,17 +284,3 @@ instance Storable GPUSceneData where
|
||||||
poke (castPtr $ ptr `plusPtr` (sizeOf fogCol + sizeOf fogDist)) ambCol
|
poke (castPtr $ ptr `plusPtr` (sizeOf fogCol + sizeOf fogDist)) ambCol
|
||||||
poke (castPtr $ ptr `plusPtr` (sizeOf fogCol + sizeOf fogDist + sizeOf ambCol)) sunDir
|
poke (castPtr $ ptr `plusPtr` (sizeOf fogCol + sizeOf fogDist + sizeOf ambCol)) sunDir
|
||||||
poke (castPtr $ ptr `plusPtr` (sizeOf fogCol + sizeOf fogDist + sizeOf ambCol + sizeOf sunDir)) sunCol
|
poke (castPtr $ ptr `plusPtr` (sizeOf fogCol + sizeOf fogDist + sizeOf ambCol + sizeOf sunDir)) sunCol
|
||||||
|
|
||||||
data UploadContext = UploadContext
|
|
||||||
{ uploadFence :: Vk.Fence
|
|
||||||
, uploadCommandPool :: Vk.CommandPool
|
|
||||||
, uploadCommandBuffer :: Vk.CommandBuffer
|
|
||||||
}
|
|
||||||
deriving (Show)
|
|
||||||
|
|
||||||
data IndirectBatch = IndirectBatch
|
|
||||||
{ batchMesh :: Mesh
|
|
||||||
, batchMaterial :: Material
|
|
||||||
, batchFirst :: Word32
|
|
||||||
, batchCount :: Word32
|
|
||||||
}
|
|
||||||
|
|
44
src/Util.hs
44
src/Util.hs
|
@ -64,47 +64,3 @@ writeDescriptorBuffer type' dstSet dBufferInfo binding = Vk.SomeStruct $
|
||||||
, Vk.descriptorType = type'
|
, Vk.descriptorType = type'
|
||||||
, Vk.bufferInfo = V.singleton dBufferInfo
|
, Vk.bufferInfo = V.singleton dBufferInfo
|
||||||
}
|
}
|
||||||
|
|
||||||
beginCommandBuffer
|
|
||||||
:: Vk.CommandBufferUsageFlags
|
|
||||||
-> Vk.CommandBufferBeginInfo '[]
|
|
||||||
beginCommandBuffer flags =
|
|
||||||
Vk.zero
|
|
||||||
{ Vk.flags = flags
|
|
||||||
}
|
|
||||||
|
|
||||||
createSubmitInfo
|
|
||||||
:: Vk.CommandBuffer
|
|
||||||
-> V.Vector (Vk.SomeStruct Vk.SubmitInfo)
|
|
||||||
createSubmitInfo cmd = V.singleton $ Vk.SomeStruct $
|
|
||||||
Vk.zero
|
|
||||||
{ Vk.commandBuffers = V.singleton (Vk.commandBufferHandle cmd)
|
|
||||||
}
|
|
||||||
|
|
||||||
samplerCreateInfo
|
|
||||||
:: Vk.Filter
|
|
||||||
-> Vk.SamplerAddressMode
|
|
||||||
-> Vk.SamplerCreateInfo '[]
|
|
||||||
samplerCreateInfo filters addressMode =
|
|
||||||
Vk.zero
|
|
||||||
{ Vk.magFilter = filters
|
|
||||||
, Vk.minFilter = filters
|
|
||||||
, Vk.addressModeU = addressMode
|
|
||||||
, Vk.addressModeV = addressMode
|
|
||||||
, Vk.addressModeW = addressMode
|
|
||||||
}
|
|
||||||
|
|
||||||
writeDescriptorImage
|
|
||||||
:: Vk.DescriptorType
|
|
||||||
-> Vk.DescriptorSet
|
|
||||||
-> Vk.DescriptorImageInfo
|
|
||||||
-> Word32
|
|
||||||
-> Vk.WriteDescriptorSet '[]
|
|
||||||
writeDescriptorImage type' set imageInfo binding =
|
|
||||||
Vk.zero
|
|
||||||
{ Vk.dstBinding = binding
|
|
||||||
, Vk.dstSet = set
|
|
||||||
, Vk.descriptorCount = 1
|
|
||||||
, Vk.descriptorType = type'
|
|
||||||
, Vk.imageInfo = V.singleton imageInfo
|
|
||||||
}
|
|
||||||
|
|
46
test.nix
46
test.nix
|
@ -1,46 +0,0 @@
|
||||||
{pkgs, vulkan-tutorial, ...}:
|
|
||||||
pkgs.nixosTest ({
|
|
||||||
name = "test";
|
|
||||||
nodes = {
|
|
||||||
machine = { config, pkgs, ...}: {
|
|
||||||
environment = {
|
|
||||||
systemPackages = with pkgs; [
|
|
||||||
vulkan-tutorial
|
|
||||||
git
|
|
||||||
shaderc
|
|
||||||
vulkan-loader
|
|
||||||
vulkan-validation-layers
|
|
||||||
];
|
|
||||||
sessionVariables = {
|
|
||||||
VK_LAYER_PATH="${pkgs.vulkan-validation-layers}/share/vulkan/explicit_layer.d";
|
|
||||||
SDL_VULKAN_LIBRARY="${pkgs.vulkan-loader}/lib/libvulkan.so";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
hardware.opengl = {
|
|
||||||
enable = true;
|
|
||||||
driSupport = true;
|
|
||||||
driSupport32Bit = true;
|
|
||||||
};
|
|
||||||
services.xserver = {
|
|
||||||
enable = true;
|
|
||||||
displayManager.sddm.enable = true;
|
|
||||||
desktopManager.cinnamon.enable = true;
|
|
||||||
};
|
|
||||||
users.users.test = {
|
|
||||||
password = "test";
|
|
||||||
extraGroups = [
|
|
||||||
"wheel"
|
|
||||||
];
|
|
||||||
isNormalUser = true;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
skipLint = true;
|
|
||||||
|
|
||||||
testScript = ''
|
|
||||||
start_all()
|
|
||||||
|
|
||||||
machine.shell_interact()
|
|
||||||
'';
|
|
||||||
})
|
|
|
@ -34,14 +34,12 @@ executable vulkan-tutorial
|
||||||
Memory
|
Memory
|
||||||
Mesh
|
Mesh
|
||||||
Image
|
Image
|
||||||
Sync
|
|
||||||
Textures
|
|
||||||
Types
|
Types
|
||||||
Util
|
Util
|
||||||
|
|
||||||
-- LANGUAGE extensions used by modules in this package.
|
-- LANGUAGE extensions used by modules in this package.
|
||||||
-- other-extensions:
|
-- other-extensions:
|
||||||
build-depends: base
|
build-depends: base >=4.14.3.0
|
||||||
, sdl2
|
, sdl2
|
||||||
, vulkan
|
, vulkan
|
||||||
, vulkan-utils
|
, vulkan-utils
|
||||||
|
@ -50,14 +48,12 @@ executable vulkan-tutorial
|
||||||
, linear
|
, linear
|
||||||
, monad-loops
|
, monad-loops
|
||||||
, stm
|
, stm
|
||||||
, time
|
|
||||||
, bytestring
|
, bytestring
|
||||||
, text
|
, text
|
||||||
, vector
|
, vector
|
||||||
, resourcet
|
, resourcet
|
||||||
, mtl
|
, mtl
|
||||||
, containers
|
, containers
|
||||||
, JuicyPixels
|
|
||||||
hs-source-dirs: src
|
hs-source-dirs: src
|
||||||
default-language: Haskell2010
|
default-language: Haskell2010
|
||||||
ghc-options: -Wall
|
ghc-options: -Wall
|
||||||
|
|
Loading…
Reference in a new issue