From a4d42554a1b5e3c78130362353f4a09b4691c93c Mon Sep 17 00:00:00 2001 From: ouv Date: Thu, 24 Nov 2005 07:33:16 +0000 Subject: [PATCH] Fixed bug GVIEW10633 : "clamp" parameter is a reserved name in GLSL --- resources/Vertex_Program_ARB.txt | 4 ++-- src/PIPELINE/VISU_OpenGLPointSpriteMapper.cxx | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/Vertex_Program_ARB.txt b/resources/Vertex_Program_ARB.txt index 0153917f..e13d0258 100755 --- 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 208e8d3a..e8636803 100755 --- 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 ]; -- 2.39.2