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
Merge requests
!54
Resolve "Cmd/Sync-Rework"
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Resolve "Cmd/Sync-Rework"
66-cmd-sync-rework
into
develop
Overview
2
Commits
22
Pipelines
16
Changes
52
Merged
Ghost User
requested to merge
66-cmd-sync-rework
into
develop
3 years ago
Overview
2
Commits
22
Pipelines
16
Changes
2
Expand
Closes
#66 (closed)
Edited
3 years ago
by
Ghost User
0
0
Merge request reports
Compare
version 8
version 14
b1408fbc
3 years ago
version 13
d85734c7
3 years ago
version 12
2aa1441f
3 years ago
version 11
f4b06de5
3 years ago
version 10
4e217306
3 years ago
version 9
c9a28a7a
3 years ago
version 8
610b8c63
3 years ago
version 7
e272189f
3 years ago
version 6
bc3ee377
3 years ago
version 5
369d3dcf
3 years ago
version 4
d6163fac
3 years ago
version 3
9651c69a
3 years ago
version 2
8bbec3c8
3 years ago
version 1
e7e255c0
3 years ago
develop (base)
and
version 9
latest version
f3dfe564
22 commits,
3 years ago
version 14
b1408fbc
21 commits,
3 years ago
version 13
d85734c7
20 commits,
3 years ago
version 12
2aa1441f
19 commits,
3 years ago
version 11
f4b06de5
18 commits,
3 years ago
version 10
4e217306
17 commits,
3 years ago
version 9
c9a28a7a
16 commits,
3 years ago
version 8
610b8c63
14 commits,
3 years ago
version 7
e272189f
13 commits,
3 years ago
version 6
bc3ee377
11 commits,
3 years ago
version 5
369d3dcf
10 commits,
3 years ago
version 4
d6163fac
9 commits,
3 years ago
version 3
9651c69a
8 commits,
3 years ago
version 2
8bbec3c8
4 commits,
3 years ago
version 1
e7e255c0
3 commits,
3 years ago
Show latest version
2 files
+
11
−
11
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
2
Search (e.g. *.vue) (Ctrl+P)
projects/cmd_sync_test/src/main.cpp
+
10
−
10
Options
@@ -60,11 +60,17 @@ int main(int argc, const char** argv) {
);
indexBuffer
.
fill
(
mesh
.
vertexGroups
[
0
].
indexBuffer
.
data
);
auto
&
attributes
=
mesh
.
vertexGroups
[
0
].
vertexBuffer
.
attributes
;
std
::
sort
(
attributes
.
begin
(),
attributes
.
end
(),
[](
const
vkcv
::
VertexAttribute
&
x
,
const
vkcv
::
VertexAttribute
&
y
)
{
return
static_cast
<
uint32_t
>
(
x
.
type
)
<
static_cast
<
uint32_t
>
(
y
.
type
);
});
const
std
::
vector
<
vkcv
::
VertexBufferBinding
>
vertexBufferBindings
=
{
vkcv
::
VertexBufferBinding
(
mesh
.
vertexGroups
[
0
].
vertexBuffer
.
attributes
[
0
].
offset
,
vertexBuffer
.
getVulkanHandle
()),
vkcv
::
VertexBufferBinding
(
mesh
.
vertexGroups
[
0
].
vertexBuffer
.
attributes
[
1
].
offset
,
vertexBuffer
.
getVulkanHandle
()),
vkcv
::
VertexBufferBinding
(
mesh
.
vertexGroups
[
0
].
vertexBuffer
.
attributes
[
2
].
offset
,
vertexBuffer
.
getVulkanHandle
())
};
vkcv
::
VertexBufferBinding
(
attributes
[
0
].
offset
,
vertexBuffer
.
getVulkanHandle
()),
vkcv
::
VertexBufferBinding
(
attributes
[
1
].
offset
,
vertexBuffer
.
getVulkanHandle
()),
vkcv
::
VertexBufferBinding
(
attributes
[
2
].
offset
,
vertexBuffer
.
getVulkanHandle
())
};
const
vkcv
::
Mesh
loadedMesh
(
vertexBufferBindings
,
indexBuffer
.
getVulkanHandle
(),
mesh
.
vertexGroups
[
0
].
numIndices
);
@@ -95,12 +101,6 @@ int main(int argc, const char** argv) {
triangleShaderProgram
.
reflectShader
(
vkcv
::
ShaderStage
::
VERTEX
);
triangleShaderProgram
.
reflectShader
(
vkcv
::
ShaderStage
::
FRAGMENT
);
auto
&
attributes
=
mesh
.
vertexGroups
[
0
].
vertexBuffer
.
attributes
;
std
::
sort
(
attributes
.
begin
(),
attributes
.
end
(),
[](
const
vkcv
::
VertexAttribute
&
x
,
const
vkcv
::
VertexAttribute
&
y
)
{
return
static_cast
<
uint32_t
>
(
x
.
type
)
<
static_cast
<
uint32_t
>
(
y
.
type
);
});
std
::
vector
<
vkcv
::
DescriptorBinding
>
descriptorBindings
=
{
vkcv
::
DescriptorBinding
(
vkcv
::
DescriptorType
::
IMAGE_SAMPLED
,
1
,
vkcv
::
ShaderStage
::
FRAGMENT
),
vkcv
::
DescriptorBinding
(
vkcv
::
DescriptorType
::
SAMPLER
,
1
,
vkcv
::
ShaderStage
::
FRAGMENT
)};
@@ -111,7 +111,7 @@ int main(int argc, const char** argv) {
windowWidth
,
windowHeight
,
trianglePass
,
mesh
.
vertexGroups
[
0
].
vertexBuffer
.
attributes
,
attributes
,
{
core
.
getDescriptorSet
(
descriptorSet
).
layout
},
true
);
vkcv
::
PipelineHandle
trianglePipeline
=
core
.
createGraphicsPipeline
(
trianglePipelineDefinition
);
Loading