Remove GL_version checks that are always true

Same as the GLSL version checks, these conditions were always true since
we only support OpenGL 3.2 now.

There was also an assertion condition that didn't make sense so I fixed
that.

Author: asarium

code/graphics/opengl/gropengl.cpp

@@ -406,10 +406,8 @@ void gr_opengl_shutdown()
 
 	GL_initted = false;
 
-	if ( GL_version >= 30 ) {
-		glDeleteVertexArrays(1, &GL_vao);
-		GL_vao = 0;
-	}
+	glDeleteVertexArrays(1, &GL_vao);
+	GL_vao = 0;
 
 	if (GL_original_gamma_ramp != NULL && os::getSDLMainWindow() != nullptr) {
 		SDL_SetWindowGammaRamp( os::getSDLMainWindow(), GL_original_gamma_ramp, (GL_original_gamma_ramp+256), (GL_original_gamma_ramp+512) );
@@ -1536,11 +1534,9 @@ bool gr_opengl_init(std::unique_ptr<os::GraphicsOperations>&& graphicsOps)
 	glGetIntegerv(GL_MAX_TEXTURE_IMAGE_UNITS, &max_texture_units);
 	max_texture_coords = 1;
 
-	// create vertex array object to make OpenGL Core happy if we can
-	if ( GL_version >= 30 ) {
-		glGenVertexArrays(1, &GL_vao);
-		glBindVertexArray(GL_vao);
-	}
+	// create vertex array object to make OpenGL Core happy
+	glGenVertexArrays(1, &GL_vao);
+	glBindVertexArray(GL_vao);
 
 	GL_state.Texture.init(max_texture_units);
 	GL_state.Array.init(max_texture_coords);
@@ -1626,10 +1622,6 @@ bool gr_opengl_init(std::unique_ptr<os::GraphicsOperations>&& graphicsOps)
 
 bool gr_opengl_is_capable(gr_capability capability)
 {
-	if ( GL_version < 20 ) {
-		return false;
-	}
-
 	switch ( capability ) {
 	case CAPABILITY_ENVIRONMENT_MAP:
 		return true;
@@ -1645,11 +1637,11 @@ bool gr_opengl_is_capable(gr_capability capability)
 	case CAPABILITY_DEFERRED_LIGHTING:
 		return !Cmdline_no_fbo && !Cmdline_no_deferred_lighting;
 	case CAPABILITY_SHADOWS:
-		return GL_version >= 32;
+		return true;
 	case CAPABILITY_BATCHED_SUBMODELS:
 		return true;
 	case CAPABILITY_POINT_PARTICLES:
-		return GL_version >= 32 && !Cmdline_no_geo_sdr_effects;
+		return true && !Cmdline_no_geo_sdr_effects;
 	case CAPABILITY_TIMESTAMP_QUERY:
 		return GL_version >= 33; // Timestamp queries are available from 3.3 onwards
 	}

code/graphics/opengl/gropenglshader.cpp

@@ -601,13 +601,11 @@ int opengl_compile_shader(shader_type sdr, uint flags)
 	opengl_shader_set_current(&new_shader);
 
 	// bind fragment data locations
-	if ( GL_version >= 32 ) {
-		glBindFragDataLocation(new_shader.program->getShaderHandle(), 0, "fragOut0");
-		glBindFragDataLocation(new_shader.program->getShaderHandle(), 1, "fragOut1");
-		glBindFragDataLocation(new_shader.program->getShaderHandle(), 2, "fragOut2");
-		glBindFragDataLocation(new_shader.program->getShaderHandle(), 3, "fragOut3");
-		glBindFragDataLocation(new_shader.program->getShaderHandle(), 4, "fragOut4");
-	}
+	glBindFragDataLocation(new_shader.program->getShaderHandle(), 0, "fragOut0");
+	glBindFragDataLocation(new_shader.program->getShaderHandle(), 1, "fragOut1");
+	glBindFragDataLocation(new_shader.program->getShaderHandle(), 2, "fragOut2");
+	glBindFragDataLocation(new_shader.program->getShaderHandle(), 3, "fragOut3");
+	glBindFragDataLocation(new_shader.program->getShaderHandle(), 4, "fragOut4");
 
 	// initialize uniforms and attributes
 	for (auto& unif : sdr_info->uniforms) {

code/graphics/opengl/gropenglstate.cpp

@@ -153,11 +153,9 @@ void opengl_state::init()
 		clipplane_Status[i] = GL_FALSE;
 	}
 
-	if (GL_version >= 30) {
-		for (i = 0; i < (int)(sizeof(clipdistance_Status) / sizeof(GLboolean)); i++) {
-			//glDisable(GL_CLIP_DISTANCE0+i);
-			clipdistance_Status[i] = GL_FALSE;
-		}
+	for (i = 0; i < (int)(sizeof(clipdistance_Status) / sizeof(GLboolean)); i++) {
+		//glDisable(GL_CLIP_DISTANCE0+i);
+		clipdistance_Status[i] = GL_FALSE;
 	}
 
 	glDepthMask(GL_FALSE);
@@ -334,7 +332,7 @@ GLboolean opengl_state::ClipPlane(GLint num, GLint state)
 
 GLboolean opengl_state::ClipDistance(GLint num, GLint state)
 {
-	Assert( (num >= 0) || (num < (int)(sizeof(clipdistance_Status) / sizeof(GLboolean))) || GL_version >= 30 );
+	Assert( (num >= 0) && (num < (int)(sizeof(clipdistance_Status) / sizeof(GLboolean))) );
 
 	GLboolean save_state = clipdistance_Status[num];
 
@@ -700,9 +698,7 @@ void opengl_array_state::BindUniformBuffer(GLuint id)
 
 void gr_opengl_clear_states()
 {
-	if ( GL_version >= 30 ) {
-		glBindVertexArray(GL_vao);
-	}
+	glBindVertexArray(GL_vao);
 
 	gr_zbias(0);
 	gr_zbuffer_set(ZBUFFER_TYPE_READ);

code/graphics/paths/NVGRenderer.cpp

@@ -50,9 +50,7 @@ namespace
 		GL_state.Texture.SetActiveUnit(0);
 		GL_state.Texture.SetTarget(0);
 
-		if ( GL_version >= 30 ) {
-			glBindVertexArray(GL_vao);
-		}
+		glBindVertexArray(GL_vao);
 
 		GL_state.Array.BindArrayBuffer(0);
 		GL_state.Array.BindUniformBuffer(0);
@@ -105,9 +103,7 @@ namespace graphics
 		{
 			GR_DEBUG_SCOPE("NanoVG flush");
 
-			if ( GL_version >= 30 ) {
-				glBindVertexArray(0);
-			}
+			glBindVertexArray(0);
 
 			gr_opengl_set_2d_matrix();