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
c1df12c7
Commit
c1df12c7
authored
3 years ago
by
Vanessa Karolek
Browse files
Options
Downloads
Patches
Plain Diff
[
#92
] adjust RTXModule::init, mention our actual problem in ASManager.cpp
parent
43e4a982
No related branches found
No related tags found
1 merge request
!75
Resolve "RTX-Module"
Pipeline
#26919
failed
3 years ago
Stage: build
Stage: deploy
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
modules/rtx/src/vkcv/rtx/ASManager.cpp
+4
-0
4 additions, 0 deletions
modules/rtx/src/vkcv/rtx/ASManager.cpp
modules/rtx/src/vkcv/rtx/RTX.cpp
+2
-1
2 additions, 1 deletion
modules/rtx/src/vkcv/rtx/RTX.cpp
projects/rtx/src/main.cpp
+3
-3
3 additions, 3 deletions
projects/rtx/src/main.cpp
with
9 additions
and
4 deletions
modules/rtx/src/vkcv/rtx/ASManager.cpp
+
4
−
0
View file @
c1df12c7
...
@@ -12,6 +12,10 @@ namespace vkcv::rtx {
...
@@ -12,6 +12,10 @@ namespace vkcv::rtx {
}
}
void
ASManager
::
buildBLAS
(
Buffer
<
uint8_t
>
&
vertexBuffer
,
Buffer
<
uint8_t
>
&
indexBuffer
)
{
void
ASManager
::
buildBLAS
(
Buffer
<
uint8_t
>
&
vertexBuffer
,
Buffer
<
uint8_t
>
&
indexBuffer
)
{
// INFO: Es scheint, dass wir einen DispatchLoaderDynamic brauchen, damit Funktionen wie .getBufferAddressKHR keine Linker Error schmeissen.
// Die Frage ist, wieso? und wie koennen wir das problem evtl. anders behandeln? Mit dem DispatchLoaderDynamic gehen zwar die Fehler weg,
// aber die Anwendung crasht...
vk
::
BufferDeviceAddressInfo
vertexBufferDeviceAddressInfo
(
vertexBuffer
.
getVulkanHandle
());
vk
::
BufferDeviceAddressInfo
vertexBufferDeviceAddressInfo
(
vertexBuffer
.
getVulkanHandle
());
vk
::
DeviceAddress
vertexBufferAddress
=
m_core
->
getContext
().
getDevice
().
getBufferAddressKHR
(
vertexBufferDeviceAddressInfo
);
vk
::
DeviceAddress
vertexBufferAddress
=
m_core
->
getContext
().
getDevice
().
getBufferAddressKHR
(
vertexBufferDeviceAddressInfo
);
vk
::
DeviceOrHostAddressConstKHR
vertexDeviceOrHostAddressConst
(
vertexBufferAddress
);
vk
::
DeviceOrHostAddressConstKHR
vertexDeviceOrHostAddressConst
(
vertexBufferAddress
);
...
...
This diff is collapsed.
Click to expand it.
modules/rtx/src/vkcv/rtx/RTX.cpp
+
2
−
1
View file @
c1df12c7
...
@@ -25,7 +25,8 @@ namespace vkcv::rtx {
...
@@ -25,7 +25,8 @@ namespace vkcv::rtx {
void
RTXModule
::
init
(
Core
*
core
,
Buffer
<
uint8_t
>
&
vertexBuffer
,
Buffer
<
uint8_t
>
&
indexBuffer
)
{
void
RTXModule
::
init
(
Core
*
core
,
Buffer
<
uint8_t
>
&
vertexBuffer
,
Buffer
<
uint8_t
>
&
indexBuffer
)
{
// build acceleration structures BLAS then TLAS --> see ASManager
// build acceleration structures BLAS then TLAS --> see ASManager
// ASManager asManager(core);
ASManager
asManager
(
core
);
asManager
.
buildBLAS
(
vertexBuffer
,
indexBuffer
);
}
}
...
...
This diff is collapsed.
Click to expand it.
projects/rtx/src/main.cpp
+
3
−
3
View file @
c1df12c7
...
@@ -53,9 +53,6 @@ int main(int argc, const char** argv) {
...
@@ -53,9 +53,6 @@ int main(int argc, const char** argv) {
deviceExtensions
deviceExtensions
);
);
// init RTXModule
// rtxModule.init(&core);
vkcv
::
scene
::
Scene
scene
=
vkcv
::
scene
::
Scene
::
load
(
core
,
std
::
filesystem
::
path
(
vkcv
::
scene
::
Scene
scene
=
vkcv
::
scene
::
Scene
::
load
(
core
,
std
::
filesystem
::
path
(
argc
>
1
?
argv
[
1
]
:
"resources/Sponza/Sponza.gltf"
argc
>
1
?
argv
[
1
]
:
"resources/Sponza/Sponza.gltf"
));
));
...
@@ -93,6 +90,9 @@ int main(int argc, const char** argv) {
...
@@ -93,6 +90,9 @@ int main(int argc, const char** argv) {
indexBuffer
.
fill
(
mesh
.
vertexGroups
[
0
].
indexBuffer
.
data
);
indexBuffer
.
fill
(
mesh
.
vertexGroups
[
0
].
indexBuffer
.
data
);
// init RTXModule
rtxModule
.
init
(
&
core
,
vertexBuffer
,
indexBuffer
);
const
vkcv
::
AttachmentDescription
present_color_attachment
(
const
vkcv
::
AttachmentDescription
present_color_attachment
(
vkcv
::
AttachmentOperation
::
STORE
,
vkcv
::
AttachmentOperation
::
STORE
,
vkcv
::
AttachmentOperation
::
CLEAR
,
vkcv
::
AttachmentOperation
::
CLEAR
,
...
...
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