Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
VkCV Framework
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Vulkan2021
VkCV Framework
Commits
406f1da2
Commit
406f1da2
authored
3 years ago
by
Alex Laptop
Browse files
Options
Downloads
Patches
Plain Diff
Add resizable window
parent
98b87e24
Branches
Branches containing commit
Tags
Tags containing commit
1 merge request
!101
Path tracing
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
projects/path_tracer/src/main.cpp
+62
-16
62 additions, 16 deletions
projects/path_tracer/src/main.cpp
with
62 additions
and
16 deletions
projects/path_tracer/src/main.cpp
+
62
−
16
View file @
406f1da2
...
@@ -47,7 +47,7 @@ int main(int argc, const char** argv) {
...
@@ -47,7 +47,7 @@ int main(int argc, const char** argv) {
applicationName
,
applicationName
,
initialWidth
,
initialWidth
,
initialHeight
,
initialHeight
,
fals
e
);
tru
e
);
vkcv
::
Core
core
=
vkcv
::
Core
::
create
(
vkcv
::
Core
core
=
vkcv
::
Core
::
create
(
window
,
window
,
...
@@ -58,21 +58,21 @@ int main(int argc, const char** argv) {
...
@@ -58,21 +58,21 @@ int main(int argc, const char** argv) {
);
);
// images
// images
vkcv
::
Image
outputImage
=
core
.
createImage
(
vkcv
::
Image
Handle
outputImage
=
core
.
createImage
(
vk
::
Format
::
eR32G32B32A32Sfloat
,
vk
::
Format
::
eR32G32B32A32Sfloat
,
initialWidth
,
initialWidth
,
initialHeight
,
initialHeight
,
1
,
1
,
false
,
false
,
true
);
true
)
.
getHandle
()
;
vkcv
::
Image
meanImage
=
core
.
createImage
(
vkcv
::
Image
Handle
meanImage
=
core
.
createImage
(
vk
::
Format
::
eR32G32B32A32Sfloat
,
vk
::
Format
::
eR32G32B32A32Sfloat
,
initialWidth
,
initialWidth
,
initialHeight
,
initialHeight
,
1
,
1
,
false
,
false
,
true
);
true
)
.
getHandle
()
;
vkcv
::
shader
::
GLSLCompiler
compiler
;
vkcv
::
shader
::
GLSLCompiler
compiler
;
...
@@ -103,8 +103,8 @@ int main(int argc, const char** argv) {
...
@@ -103,8 +103,8 @@ int main(int argc, const char** argv) {
vkcv
::
DescriptorWrites
imageCombineDescriptorWrites
;
vkcv
::
DescriptorWrites
imageCombineDescriptorWrites
;
imageCombineDescriptorWrites
.
storageImageWrites
=
{
imageCombineDescriptorWrites
.
storageImageWrites
=
{
vkcv
::
StorageImageDescriptorWrite
(
0
,
outputImage
.
getHandle
()
),
vkcv
::
StorageImageDescriptorWrite
(
0
,
outputImage
),
vkcv
::
StorageImageDescriptorWrite
(
1
,
meanImage
.
getHandle
()
)
vkcv
::
StorageImageDescriptorWrite
(
1
,
meanImage
)
};
};
core
.
writeDescriptorSet
(
imageCombineDescriptorSet
,
imageCombineDescriptorWrites
);
core
.
writeDescriptorSet
(
imageCombineDescriptorSet
,
imageCombineDescriptorWrites
);
...
@@ -138,7 +138,7 @@ int main(int argc, const char** argv) {
...
@@ -138,7 +138,7 @@ int main(int argc, const char** argv) {
vkcv
::
DescriptorWrites
imageClearDescriptorWrites
;
vkcv
::
DescriptorWrites
imageClearDescriptorWrites
;
imageClearDescriptorWrites
.
storageImageWrites
=
{
imageClearDescriptorWrites
.
storageImageWrites
=
{
vkcv
::
StorageImageDescriptorWrite
(
0
,
meanImage
.
getHandle
()
)
vkcv
::
StorageImageDescriptorWrite
(
0
,
meanImage
)
};
};
core
.
writeDescriptorSet
(
imageClearDescriptorSet
,
imageClearDescriptorWrites
);
core
.
writeDescriptorSet
(
imageClearDescriptorSet
,
imageClearDescriptorWrites
);
...
@@ -186,7 +186,7 @@ int main(int argc, const char** argv) {
...
@@ -186,7 +186,7 @@ int main(int argc, const char** argv) {
vkcv
::
BufferDescriptorWrite
(
1
,
planeBuffer
.
getHandle
()),
vkcv
::
BufferDescriptorWrite
(
1
,
planeBuffer
.
getHandle
()),
vkcv
::
BufferDescriptorWrite
(
2
,
materialBuffer
.
getHandle
())};
vkcv
::
BufferDescriptorWrite
(
2
,
materialBuffer
.
getHandle
())};
traceDescriptorWrites
.
storageImageWrites
=
{
traceDescriptorWrites
.
storageImageWrites
=
{
vkcv
::
StorageImageDescriptorWrite
(
3
,
outputImage
.
getHandle
()
)};
vkcv
::
StorageImageDescriptorWrite
(
3
,
outputImage
)};
core
.
writeDescriptorSet
(
traceDescriptorSet
,
traceDescriptorWrites
);
core
.
writeDescriptorSet
(
traceDescriptorSet
,
traceDescriptorWrites
);
vkcv
::
PipelineHandle
tracePipeline
=
core
.
createComputePipeline
(
vkcv
::
PipelineHandle
tracePipeline
=
core
.
createComputePipeline
(
...
@@ -213,6 +213,9 @@ int main(int argc, const char** argv) {
...
@@ -213,6 +213,9 @@ int main(int argc, const char** argv) {
float
cameraYawPrevious
=
0
;
float
cameraYawPrevious
=
0
;
glm
::
vec3
cameraPositionPrevious
=
glm
::
vec3
(
0
);
glm
::
vec3
cameraPositionPrevious
=
glm
::
vec3
(
0
);
uint32_t
widthPrevious
=
initialWidth
;
uint32_t
heightPrevious
=
initialHeight
;
while
(
window
.
isWindowOpen
())
while
(
window
.
isWindowOpen
())
{
{
vkcv
::
Window
::
pollEvents
();
vkcv
::
Window
::
pollEvents
();
...
@@ -222,6 +225,49 @@ int main(int argc, const char** argv) {
...
@@ -222,6 +225,49 @@ int main(int argc, const char** argv) {
continue
;
continue
;
}
}
if
(
swapchainWidth
!=
widthPrevious
||
swapchainHeight
!=
heightPrevious
)
{
// resize images
outputImage
=
core
.
createImage
(
vk
::
Format
::
eR32G32B32A32Sfloat
,
swapchainWidth
,
swapchainHeight
,
1
,
false
,
true
).
getHandle
();
meanImage
=
core
.
createImage
(
vk
::
Format
::
eR32G32B32A32Sfloat
,
swapchainWidth
,
swapchainHeight
,
1
,
false
,
true
).
getHandle
();
// update descriptor sets
traceDescriptorWrites
.
storageImageWrites
=
{
vkcv
::
StorageImageDescriptorWrite
(
3
,
outputImage
)
};
core
.
writeDescriptorSet
(
traceDescriptorSet
,
traceDescriptorWrites
);
vkcv
::
DescriptorWrites
imageCombineDescriptorWrites
;
imageCombineDescriptorWrites
.
storageImageWrites
=
{
vkcv
::
StorageImageDescriptorWrite
(
0
,
outputImage
),
vkcv
::
StorageImageDescriptorWrite
(
1
,
meanImage
)
};
core
.
writeDescriptorSet
(
imageCombineDescriptorSet
,
imageCombineDescriptorWrites
);
vkcv
::
DescriptorWrites
imageClearDescriptorWrites
;
imageClearDescriptorWrites
.
storageImageWrites
=
{
vkcv
::
StorageImageDescriptorWrite
(
0
,
meanImage
)
};
core
.
writeDescriptorSet
(
imageClearDescriptorSet
,
imageClearDescriptorWrites
);
widthPrevious
=
swapchainWidth
;
heightPrevious
=
swapchainHeight
;
clearMeanImage
=
true
;
}
auto
end
=
std
::
chrono
::
system_clock
::
now
();
auto
end
=
std
::
chrono
::
system_clock
::
now
();
auto
deltatime
=
std
::
chrono
::
duration_cast
<
std
::
chrono
::
microseconds
>
(
end
-
startTime
);
auto
deltatime
=
std
::
chrono
::
duration_cast
<
std
::
chrono
::
microseconds
>
(
end
-
startTime
);
startTime
=
end
;
startTime
=
end
;
...
@@ -249,13 +295,13 @@ int main(int argc, const char** argv) {
...
@@ -249,13 +295,13 @@ int main(int argc, const char** argv) {
glm
::
vec3
cameraPosition
=
cameraManager
.
getActiveCamera
().
getPosition
();
glm
::
vec3
cameraPosition
=
cameraManager
.
getActiveCamera
().
getPosition
();
if
(
glm
::
distance
(
cameraPosition
,
cameraPositionPrevious
)
>
0.001
)
if
(
glm
::
distance
(
cameraPosition
,
cameraPositionPrevious
)
>
0.00
0
1
)
clearMeanImage
=
true
;
// camera moved
clearMeanImage
=
true
;
// camera moved
cameraPositionPrevious
=
cameraPosition
;
cameraPositionPrevious
=
cameraPosition
;
if
(
clearMeanImage
)
{
if
(
clearMeanImage
)
{
core
.
prepareImageForStorage
(
cmdStream
,
meanImage
.
getHandle
()
);
core
.
prepareImageForStorage
(
cmdStream
,
meanImage
);
core
.
recordComputeDispatchToCmdStream
(
cmdStream
,
core
.
recordComputeDispatchToCmdStream
(
cmdStream
,
imageClearPipeline
,
imageClearPipeline
,
...
@@ -288,7 +334,7 @@ int main(int argc, const char** argv) {
...
@@ -288,7 +334,7 @@ int main(int argc, const char** argv) {
static_cast
<
uint32_t
>
(
std
::
ceil
(
swapchainHeight
/
16.
f
)),
static_cast
<
uint32_t
>
(
std
::
ceil
(
swapchainHeight
/
16.
f
)),
1
};
1
};
core
.
prepareImageForStorage
(
cmdStream
,
outputImage
.
getHandle
()
);
core
.
prepareImageForStorage
(
cmdStream
,
outputImage
);
core
.
recordComputeDispatchToCmdStream
(
cmdStream
,
core
.
recordComputeDispatchToCmdStream
(
cmdStream
,
tracePipeline
,
tracePipeline
,
...
@@ -296,8 +342,8 @@ int main(int argc, const char** argv) {
...
@@ -296,8 +342,8 @@ int main(int argc, const char** argv) {
{
vkcv
::
DescriptorSetUsage
(
0
,
core
.
getDescriptorSet
(
traceDescriptorSet
).
vulkanHandle
)
},
{
vkcv
::
DescriptorSetUsage
(
0
,
core
.
getDescriptorSet
(
traceDescriptorSet
).
vulkanHandle
)
},
pushConstantsCompute
);
pushConstantsCompute
);
core
.
prepareImageForStorage
(
cmdStream
,
meanImage
.
getHandle
()
);
core
.
prepareImageForStorage
(
cmdStream
,
meanImage
);
core
.
recordImageMemoryBarrier
(
cmdStream
,
outputImage
.
getHandle
()
);
core
.
recordImageMemoryBarrier
(
cmdStream
,
outputImage
);
// combine images
// combine images
core
.
recordComputeDispatchToCmdStream
(
cmdStream
,
core
.
recordComputeDispatchToCmdStream
(
cmdStream
,
...
@@ -306,14 +352,14 @@ int main(int argc, const char** argv) {
...
@@ -306,14 +352,14 @@ int main(int argc, const char** argv) {
{
vkcv
::
DescriptorSetUsage
(
0
,
core
.
getDescriptorSet
(
imageCombineDescriptorSet
).
vulkanHandle
)
},
{
vkcv
::
DescriptorSetUsage
(
0
,
core
.
getDescriptorSet
(
imageCombineDescriptorSet
).
vulkanHandle
)
},
vkcv
::
PushConstants
(
0
));
vkcv
::
PushConstants
(
0
));
core
.
recordImageMemoryBarrier
(
cmdStream
,
meanImage
.
getHandle
()
);
core
.
recordImageMemoryBarrier
(
cmdStream
,
meanImage
);
// present image
// present image
const
vkcv
::
ImageHandle
swapchainInput
=
vkcv
::
ImageHandle
::
createSwapchainImageHandle
();
const
vkcv
::
ImageHandle
swapchainInput
=
vkcv
::
ImageHandle
::
createSwapchainImageHandle
();
vkcv
::
DescriptorWrites
presentDescriptorWrites
;
vkcv
::
DescriptorWrites
presentDescriptorWrites
;
presentDescriptorWrites
.
storageImageWrites
=
{
presentDescriptorWrites
.
storageImageWrites
=
{
vkcv
::
StorageImageDescriptorWrite
(
0
,
meanImage
.
getHandle
()
),
vkcv
::
StorageImageDescriptorWrite
(
0
,
meanImage
),
vkcv
::
StorageImageDescriptorWrite
(
1
,
swapchainInput
)
};
vkcv
::
StorageImageDescriptorWrite
(
1
,
swapchainInput
)
};
core
.
writeDescriptorSet
(
presentDescriptorSet
,
presentDescriptorWrites
);
core
.
writeDescriptorSet
(
presentDescriptorSet
,
presentDescriptorWrites
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment