From 916cc1d76dd98bf4ada297e9257d4f52a97ff48d Mon Sep 17 00:00:00 2001 From: Jonathas Costa Date: Sat, 18 May 2019 16:46:10 -0400 Subject: [PATCH] Issue/871 (#874) * Fixed wrong merging. * Add flat qualifiers to both geometry and fragment shaders --- modules/space/shaders/star_ge.glsl | 11 ++++++----- modules/space/shaders/star_vs.glsl | 13 ------------- 2 files changed, 6 insertions(+), 18 deletions(-) diff --git a/modules/space/shaders/star_ge.glsl b/modules/space/shaders/star_ge.glsl index eddf05e47e..ef686eb39d 100644 --- a/modules/space/shaders/star_ge.glsl +++ b/modules/space/shaders/star_ge.glsl @@ -36,12 +36,13 @@ in vec4 vs_gPosition[]; in float vs_speed[]; out vec4 vs_position; -out vec4 ge_bvLumAbsMagAppMag; -out vec3 ge_velocity; -out float ge_speed; out vec2 psfCoords; -out float ge_observationDistance; -out float gs_screenSpaceDepth; + +flat out vec4 ge_bvLumAbsMagAppMag; +flat out vec3 ge_velocity; +flat out float ge_speed; +flat out float ge_observationDistance; +flat out float gs_screenSpaceDepth; uniform float magnitudeExponent; uniform dvec3 eyePosition; diff --git a/modules/space/shaders/star_vs.glsl b/modules/space/shaders/star_vs.glsl index 6db4250969..c02770e5eb 100644 --- a/modules/space/shaders/star_vs.glsl +++ b/modules/space/shaders/star_vs.glsl @@ -34,19 +34,6 @@ in float in_speed; out vec4 vs_bvLumAbsMagAppMag; out vec3 vs_velocity; out float vs_speed; -out vec4 vs_correctedPositionViewSpace; - -out vec4 psc_position; -out vec3 vs_brightness; -out vec4 vs_gPosition; - -/* -uniform mat4 view; -uniform mat4 projection; - -uniform float FWHM; -uniform float betaConstant; -*/ void main() { vs_bvLumAbsMagAppMag = in_bvLumAbsMagAppMag;