From 66f92a336e61857030a5f56adda5950f792ea0c1 Mon Sep 17 00:00:00 2001 From: Maxime Gimeno Date: Mon, 30 Aug 2021 11:11:57 +0200 Subject: [PATCH] Restore compatibility shader code --- GraphicsView/include/CGAL/Basic_shaders.h | 33 +++++++++++------------ 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/GraphicsView/include/CGAL/Basic_shaders.h b/GraphicsView/include/CGAL/Basic_shaders.h index 1e9f7697c0a..ff7de984625 100644 --- a/GraphicsView/include/CGAL/Basic_shaders.h +++ b/GraphicsView/include/CGAL/Basic_shaders.h @@ -176,17 +176,17 @@ void main(void) // compatibility shaders const char vertex_source_color_comp[]=R"DELIM( -in highp vec4 vertex; -in highp vec3 normal; -in highp vec3 color; +varying highp vec4 vertex; +varying highp vec3 normal; +varying highp vec3 color; uniform highp mat4 mvp_matrix; uniform highp mat4 mv_matrix; uniform highp float point_size; -out highp vec4 fP; -out highp vec3 fN; -out highp vec4 fColor; +varying highp vec4 fP; +varying highp vec3 fN; +varying highp vec4 fColor; void main(void) { @@ -204,9 +204,9 @@ void main(void) )DELIM"; const char fragment_source_color_comp[]=R"DELIM( -in highp vec4 fP; -in highp vec3 fN; -in highp vec4 fColor; +varying highp vec4 fP; +varying highp vec3 fN; +varying highp vec4 fColor; uniform highp vec4 light_pos; uniform highp vec4 light_diff; @@ -214,8 +214,6 @@ uniform highp vec4 light_spec; uniform highp vec4 light_amb; uniform highp float spec_power ; -out highp vec4 out_color; - void main(void) { highp vec3 L = light_pos.xyz - fP.xyz; @@ -229,18 +227,18 @@ void main(void) highp vec4 diffuse = max(dot(N,L), 0.0) * light_diff * fColor; highp vec4 specular = pow(max(dot(R,V), 0.0), spec_power) * light_spec; - out_color = light_amb*fColor + diffuse; + gl_FragColor = light_amb*fColor + diffuse; } )DELIM"; const char vertex_source_p_l_comp[]=R"DELIM( -in highp vec4 vertex; -in highp vec3 color; +varying highp vec4 vertex; +varying highp vec3 color; uniform highp mat4 mvp_matrix; uniform highp float point_size; -out highp vec4 fColor; +varying highp vec4 fColor; void main(void) { @@ -251,11 +249,10 @@ void main(void) )DELIM"; const char fragment_source_p_l_comp[]=R"DELIM( -in highp vec4 fColor; -out highp vec4 out_color; +varying highp vec4 fColor; void main(void) { - out_color = fColor; + gl_FragColor = fColor; } )DELIM";