From c80474cd67e0f53ddf31b105a0df76e7e7a7ec9f Mon Sep 17 00:00:00 2001 From: Alexander Rose <alex.rose@rcsb.org> Date: Thu, 24 Jan 2019 15:50:27 -0800 Subject: [PATCH] no (flat) interpolation in shaders for picking (only webgl2) --- src/mol-gl/shader/chunks/color-frag-params.glsl | 8 +++++++- src/mol-gl/shader/chunks/color-vert-params.glsl | 6 +++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/mol-gl/shader/chunks/color-frag-params.glsl b/src/mol-gl/shader/chunks/color-frag-params.glsl index caa12c98d..85052a170 100644 --- a/src/mol-gl/shader/chunks/color-frag-params.glsl +++ b/src/mol-gl/shader/chunks/color-frag-params.glsl @@ -1,5 +1,11 @@ #if defined(dColorType_uniform) uniform vec3 uColor; -#elif defined(dColorType_attribute) || defined(dColorType_instance) || defined(dColorType_group) || defined(dColorType_groupInstance) || defined(dColorType_objectPicking) || defined(dColorType_instancePicking) || defined(dColorType_groupPicking) +#elif defined(dColorType_attribute) || defined(dColorType_instance) || defined(dColorType_group) || defined(dColorType_groupInstance) varying vec4 vColor; +#elif defined(dColorType_objectPicking) || defined(dColorType_instancePicking) || defined(dColorType_groupPicking) + #if __VERSION__ != 300 + varying vec4 vColor; + #else + flat in vec4 vColor; + #endif #endif \ No newline at end of file diff --git a/src/mol-gl/shader/chunks/color-vert-params.glsl b/src/mol-gl/shader/chunks/color-vert-params.glsl index abc149ebd..d2219d9b6 100644 --- a/src/mol-gl/shader/chunks/color-vert-params.glsl +++ b/src/mol-gl/shader/chunks/color-vert-params.glsl @@ -8,6 +8,10 @@ uniform vec2 uColorTexDim; uniform sampler2D tColor; #elif defined(dColorType_objectPicking) || defined(dColorType_instancePicking) || defined(dColorType_groupPicking) - varying vec4 vColor; + #if __VERSION__ != 300 + varying vec4 vColor; + #else + flat out vec4 vColor; + #endif #pragma glslify: encodeFloatRGB = require(../utils/encode-float-rgb.glsl) #endif \ No newline at end of file -- GitLab