From 9bc184e4eb70d6c50806c3a1a5e9d7d89d4924da Mon Sep 17 00:00:00 2001 From: Phillip Stephens Date: Sun, 3 Jul 2016 16:35:03 -0700 Subject: [PATCH] Shader error fixes, update amuse --- Runtime/Graphics/CLineRendererShadersGLSL.cpp | 1 + Runtime/Particle/CElementGenShadersGLSL.cpp | 1 + amuse | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Runtime/Graphics/CLineRendererShadersGLSL.cpp b/Runtime/Graphics/CLineRendererShadersGLSL.cpp index 25167eb2b..d71a94940 100644 --- a/Runtime/Graphics/CLineRendererShadersGLSL.cpp +++ b/Runtime/Graphics/CLineRendererShadersGLSL.cpp @@ -72,6 +72,7 @@ BOO_GLSL_BINDING_HEAD static const char* FS_GLSL_NOTEX = "#version 330\n" +BOO_GLSL_BINDING_HEAD "struct VertToFrag\n" "{\n" " vec4 color;\n" diff --git a/Runtime/Particle/CElementGenShadersGLSL.cpp b/Runtime/Particle/CElementGenShadersGLSL.cpp index 9c8196172..a291fc01f 100644 --- a/Runtime/Particle/CElementGenShadersGLSL.cpp +++ b/Runtime/Particle/CElementGenShadersGLSL.cpp @@ -173,6 +173,7 @@ BOO_GLSL_BINDING_HEAD static const char* FS_GLSL_NOTEX = "#version 330\n" +BOO_GLSL_BINDING_HEAD "struct VertToFrag\n" "{\n" " vec4 color;\n" diff --git a/amuse b/amuse index 5ad8c06b9..342751596 160000 --- a/amuse +++ b/amuse @@ -1 +1 @@ -Subproject commit 5ad8c06b992359535a44695c8d8c5dfd991a2914 +Subproject commit 3427515960c959d43a918dc667ba13479e741b0f