Remove unneeded glUseProgram(0)

src/celengine/asterismrenderer.cpp

@@ -73,7 +73,6 @@ void AsterismRenderer::render(const Renderer &renderer, const Color &defaultColo
         offset += m_vtxCount[i];
     }
 
-    glUseProgram(0);
     m_vo.unbind();
 }
 

src/celengine/axisarrow.cpp

@@ -291,7 +291,6 @@ ArrowReferenceMark::render(Renderer* renderer,
     auto &vo = renderer->getVertexObject(VOType::AxisArrow, GL_ARRAY_BUFFER, 0, GL_STATIC_DRAW);
     RenderArrow(vo);
 
-    glUseProgram(0);
     renderer->disableDepthTest();
     renderer->disableDepthMask();
     renderer->enableBlending();
@@ -419,7 +418,6 @@ AxesReferenceMark::render(Renderer* renderer,
     prog->MVPMatrix = t * labelTransformMatrix;
     RenderZ(vo);
 
-    glUseProgram(0);
     renderer->disableDepthTest();
     renderer->disableDepthMask();
     renderer->enableBlending();

src/celengine/boundariesrenderer.cpp

@@ -55,7 +55,6 @@ void BoundariesRenderer::render(const Renderer &renderer, const Color &color, co
     glVertexAttrib(CelestiaGLProgram::ColorAttributeIndex, color);
     m_vo.draw(GL_LINES, m_vtxTotal);
 
-    glUseProgram(0);
     m_vo.unbind();
 }
 

src/celengine/galaxy.cpp

@@ -471,7 +471,6 @@ void Galaxy::renderGalaxyPointSprites(const Vector3f& offset,
 
     glDisableVertexAttribArray(CelestiaGLProgram::VertexCoordAttributeIndex);
     glDisableVertexAttribArray(CelestiaGLProgram::TextureCoord0AttributeIndex);
-    glUseProgram(0);
     glActiveTexture(GL_TEXTURE0);
 }
 

src/celengine/glmarker.cpp

@@ -300,7 +300,6 @@ void Renderer::renderMarker(MarkerRepresentation::Symbol symbol,
         break;
     }
 
-    glUseProgram(0);
     markerVO.unbind();
 }
 
@@ -374,7 +373,6 @@ void Renderer::renderSelectionPointer(const Observer& observer,
     prog->vec3Param("v") = v;
     markerVO.draw(GL_TRIANGLES, SelPointerCount, SelPointerOffset);
 
-    glUseProgram(0);
     markerVO.unbind();
 
 #ifdef USE_HDR
@@ -405,7 +403,6 @@ void Renderer::renderEclipticLine()
     prog->vec4Param("color") = EclipticColor.toVector4();
     markerVO.draw(GL_LINE_LOOP, EclipticCount, EclipticOffset);
 
-    glUseProgram(0);
     markerVO.unbind();
 }
 
@@ -450,6 +447,5 @@ void Renderer::renderCrosshair(float selectionSizeInPixels,
         prog->floatParam("angle") = theta;
         markerVO.draw(GL_TRIANGLES, CrosshairCount, CrosshairOffset);
     }
-    glUseProgram(0);
     markerVO.unbind();
 }

src/celengine/globular.cpp

@@ -504,7 +504,6 @@ void Globular::renderGlobularPointSprites(
 
     vo.draw(GL_POINTS, count, 4);
 
-    glUseProgram(0);
     vo.unbind();
 #ifndef GL_ES
     glDisable(GL_POINT_SPRITE);

src/celengine/nebula.cpp

@@ -105,7 +105,6 @@ void Nebula::render(const Vector3f& /*offset*/,
     rc.setProjectionMatrix(m.projection);
     rc.setModelViewMatrix(&mv);
     g->render(rc);
-    glUseProgram(0);
 
     renderer->enableBlending();
 }

src/celengine/planetgrid.cpp

@@ -247,7 +247,6 @@ PlanetographicGrid::render(Renderer* renderer,
 
     glDisableVertexAttribArray(CelestiaGLProgram::VertexCoordAttributeIndex);
 
-    glUseProgram(0);
     renderer->disableDepthTest();
     renderer->disableDepthMask();
     renderer->enableBlending();

src/celengine/pointstarvertexbuffer.cpp

@@ -106,7 +106,7 @@ void PointStarVertexBuffer::render()
             glPointSize(1.0f);
         }
 #endif
-        glVertexAttribPointer(CelestiaGLProgram::VertexCoordAttributeIndex, 
+        glVertexAttribPointer(CelestiaGLProgram::VertexCoordAttributeIndex,
                               3, GL_FLOAT, GL_FALSE,
                               stride, &vertices[0].position);
         glVertexAttribPointer(CelestiaGLProgram::ColorAttributeIndex,
@@ -140,7 +140,6 @@ void PointStarVertexBuffer::finish()
         glDisable(GL_POINT_SPRITE);
 #endif
     }
-    glUseProgram(0);
 }
 
 void PointStarVertexBuffer::setTexture(Texture* _texture)

src/celengine/render.cpp

@@ -1342,8 +1342,6 @@ void Renderer::renderOrbit(const OrbitPathListEntry& orbitPath,
 #ifdef STIPPLED_LINES
     glDisable(GL_LINE_STIPPLE);
 #endif
-
-    glUseProgram(0);
 }
 
 
@@ -1822,7 +1820,6 @@ void renderPoint(const Renderer &renderer,
         glDisable(GL_VERTEX_PROGRAM_POINT_SIZE);
     glDisable(GL_POINT_SPRITE);
 #endif
-    glUseProgram(0);
 }
 
 // If the an object occupies a pixel or less of screen space, we don't
@@ -2217,7 +2214,6 @@ void Renderer::renderEllipsoidAtmosphere(const Atmosphere& atmosphere,
 
     glDisableVertexAttribArray(CelestiaGLProgram::ColorAttributeIndex);
     glDisableVertexAttribArray(CelestiaGLProgram::VertexCoordAttributeIndex);
-    glUseProgram(0);
 }
 
 
@@ -2262,8 +2258,6 @@ static void renderSphereUnlit(const RenderInfo& ri,
     prog->nightLightScale = ri.nightLightScale;
 #endif
     g_lodSphere->render(frustum, ri.pixWidth, textures, nTextures);
-
-    glUseProgram(0);
 }
 
 
@@ -2287,8 +2281,6 @@ static void renderCloudsUnlit(const RenderInfo& ri,
     prog->textureOffset = cloudTexOffset;
 
     g_lodSphere->render(frustum, ri.pixWidth, &cloudTex, 1);
-
-    glUseProgram(0);
 }
 
 void
@@ -3728,7 +3720,6 @@ void Renderer::renderCometTail(const Body& body,
     if (brightness != -1)
         glDisableVertexAttribArray(brightness);
     glEnable(GL_CULL_FACE);
-    glUseProgram(0);
 
 #ifdef DEBUG_COMET_TAIL
     glColor4f(0.0f, 1.0f, 1.0f, 0.5f);
@@ -4798,7 +4789,6 @@ void Renderer::renderParticles(const vector<Particle>& particles)
 
     glDisableVertexAttribArray(CelestiaGLProgram::VertexCoordAttributeIndex);
     glDisableVertexAttribArray(CelestiaGLProgram::PointSizeAttributeIndex);
-    glUseProgram(0);
 #ifndef GL_ES
     glDisable(GL_POINT_SPRITE);
 #endif
@@ -5406,7 +5396,6 @@ void Renderer::drawRectangle(const Rect &r, const Matrix4f &mvp)
             glLineWidth(1.0f);
     }
 
-    glUseProgram(0);
     glDisableVertexAttribArray(CelestiaGLProgram::ColorAttributeIndex);
     glDisableVertexAttribArray(CelestiaGLProgram::TextureCoord0AttributeIndex);
     glDisableVertexAttribArray(CelestiaGLProgram::VertexCoordAttributeIndex);

src/celengine/renderglsl.cpp

@@ -289,8 +289,6 @@ void renderEllipsoid_GLSL(const RenderInfo& ri,
     g_lodSphere->render(attributes,
                         frustum, ri.pixWidth,
                         textures[0], textures[1], textures[2], textures[3]);
-
-    glUseProgram(0);
 }
 
 
@@ -418,8 +416,6 @@ void renderGeometry_GLSL(Geometry* geometry,
     {
         geometry->render(rc, tsec);
     }
-
-    glUseProgram(0);
 }
 
 
@@ -463,8 +459,6 @@ void renderGeometry_GLSL_Unlit(Geometry* geometry,
     {
         geometry->render(rc, tsec);
     }
-
-    glUseProgram(0);
 }
 
 
@@ -598,8 +592,6 @@ void renderClouds_GLSL(const RenderInfo& ri,
                         textures[0], textures[1], textures[2], textures[3]);
 
     prog->textureOffset = 0.0f;
-
-    glUseProgram(0);
 }
 
 
@@ -663,7 +655,6 @@ renderAtmosphere_GLSL(const RenderInfo& ri,
     renderer->disableBlending();
     renderer->enableDepthMask();
     glFrontFace(GL_CCW);
-    glUseProgram(0);
 }
 
 static void renderRingSystem(GLuint *vboId,
@@ -883,8 +874,6 @@ void renderRings_GLSL(RingSystem& rings,
     renderRingSystem(&data->vboId[i], inner, outer, nSections);
 
     renderer->setBlendingFactors(GL_SRC_ALPHA, GL_ONE);
-
-    glUseProgram(0);
 }
 
 // Calculate the matrix used to render the model from the
@@ -947,7 +936,6 @@ void renderGeometryShadow_GLSL(Geometry* geometry,
 
     geometry->render(rc, tsec);
 
-    glUseProgram(0);
     glDisable(GL_POLYGON_OFFSET_FILL);
     // Re-enable the color buffer
     glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);

src/celengine/skygrid.cpp

@@ -715,6 +715,5 @@ SkyGrid::render(Renderer& renderer,
     glDrawArrays(GL_LINES, 0, 8);
 
     glDisableVertexAttribArray(CelestiaGLProgram::VertexCoordAttributeIndex);
-    glUseProgram(0);
     delete[] buffer;
 }

src/celengine/visibleregion.cpp

@@ -120,7 +120,6 @@ renderTerminator(Renderer* renderer,
     vo.draw(GL_LINE_LOOP, pos.size());
 
     vo.unbind();
-    glUseProgram(0);
 }
 
 

src/celttf/truetypefont.cpp

@@ -616,7 +616,6 @@ void TextureFont::unbind()
     impl->m_shaderInUse = false;
     glActiveTexture(GL_TEXTURE0);
     glBindTexture(GL_TEXTURE_2D, 0);
-    glUseProgram(0);
 }
 
 short TextureFont::getAdvance(wchar_t ch) const