Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
K
Kayak UI 0.11
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository 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
Microhacks
Bevy Forks
Kayak UI 0.11
Commits
da79a5e7
Commit
da79a5e7
authored
2 years ago
by
John Mitchell
Browse files
Options
Downloads
Patches
Plain Diff
Formatting.
parent
5a9fadc2
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/render/material/pipeline.rs
+12
-5
12 additions, 5 deletions
src/render/material/pipeline.rs
src/render/unified/mod.rs
+1
-1
1 addition, 1 deletion
src/render/unified/mod.rs
src/render/unified/pipeline.rs
+1
-1
1 addition, 1 deletion
src/render/unified/pipeline.rs
with
14 additions
and
7 deletions
src/render/material/pipeline.rs
+
12
−
5
View file @
da79a5e7
...
@@ -34,9 +34,9 @@ use crate::render::{
...
@@ -34,9 +34,9 @@ use crate::render::{
svg
::
RenderSvgs
,
svg
::
RenderSvgs
,
ui_pass
::{
TransparentOpacityUI
,
TransparentUI
},
ui_pass
::{
TransparentOpacityUI
,
TransparentUI
},
unified
::
pipeline
::{
unified
::
pipeline
::{
queue_quads_inner
,
DrawUIDraw
,
ExtractedQuad
,
ImageBindGroups
,
PreviousClip
,
QuadBatch
,
queue_quads_inner
,
DrawUIDraw
,
ExtractedQuad
,
ImageBindGroups
,
PreviousClip
,
PreviousIndex
,
QuadMeta
,
QuadTypeOffsets
,
SetUIViewBindGroup
,
UIQuadType
,
UnifiedPipeline
,
QuadBatch
,
QuadMeta
,
QuadTypeOffsets
,
SetUIViewBindGroup
,
UIQuadType
,
UnifiedPipeline
,
UnifiedPipelineKey
,
PreviousIndex
,
UnifiedPipelineKey
,
},
},
};
};
...
@@ -319,13 +319,20 @@ pub fn queue_material_ui_quads<M: MaterialUI>(
...
@@ -319,13 +319,20 @@ pub fn queue_material_ui_quads<M: MaterialUI>(
&
'static
UIExtractedView
,
&
'static
UIExtractedView
,
)
>
,
)
>
,
mut
image_bind_groups
:
ResMut
<
ImageBindGroups
>
,
mut
image_bind_groups
:
ResMut
<
ImageBindGroups
>
,
(
gpu_images
,
font_texture_cache
,
quad_types_offsets
,
render_materials
,
mut
prev_clip
,
prev_index
):
(
(
gpu_images
,
font_texture_cache
,
quad_types_offsets
,
render_materials
,
mut
prev_clip
,
prev_index
,
):
(
Res
<
RenderAssets
<
Image
>>
,
Res
<
RenderAssets
<
Image
>>
,
Res
<
FontTextureCache
>
,
Res
<
FontTextureCache
>
,
Res
<
QuadTypeOffsets
>
,
Res
<
QuadTypeOffsets
>
,
Res
<
RenderMaterialsUI
<
M
>>
,
Res
<
RenderMaterialsUI
<
M
>>
,
ResMut
<
PreviousClip
>
,
ResMut
<
PreviousClip
>
,
Res
<
PreviousIndex
>
Res
<
PreviousIndex
>
,
),
),
)
where
)
where
M
::
Data
:
PartialEq
+
Eq
+
Hash
+
Clone
,
M
::
Data
:
PartialEq
+
Eq
+
Hash
+
Clone
,
...
...
This diff is collapsed.
Click to expand it.
src/render/unified/mod.rs
+
1
−
1
View file @
da79a5e7
...
@@ -24,7 +24,7 @@ use crate::{
...
@@ -24,7 +24,7 @@ use crate::{
use
self
::
pipeline
::{
use
self
::
pipeline
::{
queue_quad_types
,
queue_ui_view_bind_groups
,
DrawUITransparent
,
ExtractedQuads
,
queue_quad_types
,
queue_ui_view_bind_groups
,
DrawUITransparent
,
ExtractedQuads
,
ImageBindGroups
,
PreviousClip
,
QuadTypeOffsets
,
PreviousIndex
,
ImageBindGroups
,
PreviousClip
,
PreviousIndex
,
QuadTypeOffsets
,
};
};
use
super
::{
svg
::
RenderSvgs
,
ui_pass
::
TransparentOpacityUI
};
use
super
::{
svg
::
RenderSvgs
,
ui_pass
::
TransparentOpacityUI
};
...
...
This diff is collapsed.
Click to expand it.
src/render/unified/pipeline.rs
+
1
−
1
View file @
da79a5e7
...
@@ -697,7 +697,7 @@ pub fn queue_quads(queue_quads: QueueQuads) {
...
@@ -697,7 +697,7 @@ pub fn queue_quads(queue_quads: QueueQuads) {
)
)
}
}
}
}
prev_index
.index
=
index
;
prev_index
.index
=
index
;
}
}
...
...
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