Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-23 12:54:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:highfidelity/hifi into black-bis

Browse source
This commit is contained in:
sam gateau 2018-09-21 08:19:50 -07:00
commit aa02dcb087
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/render-utils/src/Highlight.slh
View file

@ -15,7 +15,7 @@
<@include Highlight_shared.slh@> <@include Highlight_shared.slh@>
layout(binding=RENDER_UTILS_BUFFER_HIGHLIGHT_PARAMS) uniform highlightParamsBuffer { layout(std140, binding=RENDER_UTILS_BUFFER_HIGHLIGHT_PARAMS) uniform highlightParamsBuffer {
HighlightParameters params; HighlightParameters params;
}; };

2
libraries/render-utils/src/Highlight_aabox.slv
View file

@ -45,7 +45,7 @@ struct HighlightParameters {
vec2 outlineWidth; vec2 outlineWidth;
}; };
layout(binding=0) uniform parametersBuffer { layout(std140, binding=0) uniform parametersBuffer {
HighlightParameters _parameters; HighlightParameters _parameters;
}; };