Fixed bug GVIEW10633 : "clamp" parameter is a reserved name in GLSL

diff --git a/resources/Vertex_Program_ARB.txt b/resources/Vertex_Program_ARB.txt
index 0153917f3d9d73088217162df44050d387743cd8..e13d0258a4cf0b89f98f6e5812e28996064046a6 100755 (executable)
--- a/resources/Vertex_Program_ARB.txt
+++ b/resources/Vertex_Program_ARB.txt
@@ -1,4 +1,4 @@
-attribute float clamp;
+attribute float clamp_size;
 
 void main()
 {
@@ -8,5 +8,5 @@ void main()
   gl_FrontColor.y = gl_Color.y;
   gl_FrontColor.z = gl_Color.z;
 
-  gl_PointSize = min( gl_Color.w * gl_ProjectionMatrix[0].x, clamp );
+  gl_PointSize = min( gl_Color.w * gl_ProjectionMatrix[0].x, clamp_size );
 }

diff --git a/src/PIPELINE/VISU_OpenGLPointSpriteMapper.cxx b/src/PIPELINE/VISU_OpenGLPointSpriteMapper.cxx
index 208e8d3a21025d7b03ab075e47c5ee85cef1575a..e8636803ca4660d764e5ce597e4ddd37ba923ec4 100755 (executable)
--- a/src/PIPELINE/VISU_OpenGLPointSpriteMapper.cxx
+++ b/src/PIPELINE/VISU_OpenGLPointSpriteMapper.cxx
@@ -679,7 +679,7 @@ void VISU_OpenGLPointSpriteMapper::DrawPoints(vtkPoints *p,
 
   vglUseProgramObjectARB( this->VertexProgram );
 
-  this->SetShaderVariable( "clamp",   this->PointSpriteClamp );
+  this->SetShaderVariable( "clamp_size", this->PointSpriteClamp );
 
   TVertex* aVertex = new TVertex[ this->TotalCells ];