diff --git a/interface/src/raypick/ParabolaPointer.cpp b/interface/src/raypick/ParabolaPointer.cpp index 9371995a2a..c7ef6582d1 100644 --- a/interface/src/raypick/ParabolaPointer.cpp +++ b/interface/src/raypick/ParabolaPointer.cpp @@ -12,11 +12,9 @@ #include #include +#include + #include "ParabolaPick.h" - -#include "render-utils/parabola_vert.h" -#include "render-utils/parabola_frag.h" - const glm::vec4 ParabolaPointer::RenderState::ParabolaRenderItem::DEFAULT_PARABOLA_COLOR { 1.0f }; const float ParabolaPointer::RenderState::ParabolaRenderItem::DEFAULT_PARABOLA_WIDTH { 0.01f }; const bool ParabolaPointer::RenderState::ParabolaRenderItem::DEFAULT_PARABOLA_ISVISIBLEINSECONDARYCAMERA { false }; @@ -326,13 +324,7 @@ void ParabolaPointer::RenderState::ParabolaRenderItem::updateKey() { const gpu::PipelinePointer ParabolaPointer::RenderState::ParabolaRenderItem::getParabolaPipeline() { if (!_parabolaPipeline || !_transparentParabolaPipeline) { - auto vs = parabola_vert::getShader(); - auto ps = parabola_frag::getShader(); - gpu::ShaderPointer program = gpu::Shader::createProgram(vs, ps); - - gpu::Shader::BindingSet slotBindings; - slotBindings.insert(gpu::Shader::Binding(std::string("parabolaData"), 0)); - gpu::Shader::makeProgram(*program, slotBindings); + gpu::ShaderPointer program = gpu::Shader::createProgram(shader::render_utils::program::parabola); { auto state = std::make_shared(); diff --git a/libraries/render-utils/src/parabola.slf b/libraries/render-utils/src/parabola.slf index ae7a44ddd1..8863f37083 100644 --- a/libraries/render-utils/src/parabola.slf +++ b/libraries/render-utils/src/parabola.slf @@ -9,9 +9,9 @@ // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // -in vec4 _color; +layout(location=0) in vec4 _color; -out vec4 _fragColor; +layout(location=0) out vec4 _fragColor; void main(void) { _fragColor = _color; diff --git a/libraries/render-utils/src/parabola.slv b/libraries/render-utils/src/parabola.slv index c40fc89302..46d6924191 100644 --- a/libraries/render-utils/src/parabola.slv +++ b/libraries/render-utils/src/parabola.slv @@ -12,7 +12,7 @@ <@include gpu/Transform.slh@> <$declareStandardTransform()$> -layout(std140) uniform parabolaData { +layout(std140, binding=0) uniform parabolaData { vec3 velocity; float parabolicDistance; vec3 acceleration; @@ -22,7 +22,7 @@ layout(std140) uniform parabolaData { ivec3 spare; }; -out vec4 _color; +layout(location=0) out vec4 _color; void main(void) { _color = color; diff --git a/libraries/shaders/CMakeLists.txt b/libraries/shaders/CMakeLists.txt index 06998e3ef5..d27dacc769 100644 --- a/libraries/shaders/CMakeLists.txt +++ b/libraries/shaders/CMakeLists.txt @@ -69,6 +69,8 @@ AUTOSCRIBE_PROGRAM(NAME simple_textured_unlit_fade VERTEX simple_fade) AUTOSCRIBE_PROGRAM(NAME simple_transparent_textured_fade VERTEX simple_fade) AUTOSCRIBE_PROGRAM(NAME simple_transparent_textured_unlit_fade VERTEX simple_fade) +AUTOSCRIBE_PROGRAM(NAME parabola) + AUTOSCRIBE_PROGRAM(NAME sdf_text3D) AUTOSCRIBE_PROGRAM(NAME sdf_text3D_transparent VERTEX sdf_text3D)