Remove reference to WITH_LEGACY_OPENGL

We only keep this as a way to get GPU_stubs to run, in case we want to do a
throughout cleanup in the codebase and want code using legacy calls to
fail to build.

3 files changed, 0 insertions, 92 deletions

diff --git a/intern/ghost/intern/GHOST_ContextWGL.cpp b/intern/ghost/intern/GHOST_ContextWGL.cpp
index 3538632ce40..8cf311b9e84 100644
--- a/intern/ghost/intern/GHOST_ContextWGL.cpp
+++ b/intern/ghost/intern/GHOST_ContextWGL.cpp
@@ -878,23 +878,6 @@ GHOST_TSuccess GHOST_ContextWGL::initializeDrawingContext()
 		else
 			m_hGLRC = s_sharedHGLRC;
 	}
-#ifdef WITH_LEGACY_OPENGL
-	else {
-		if (m_contextProfileMask  != 0)
-			fprintf(stderr, "Warning! Legacy WGL is unable to select between OpenGL profiles.");
-
-		if (m_contextMajorVersion != 0 || m_contextMinorVersion != 0)
-			fprintf(stderr, "Warning! Legacy WGL is unable to select between OpenGL versions.");
-
-		if (m_contextFlags != 0)
-			fprintf(stderr, "Warning! Legacy WGL is unable to set context flags.");
-
-		if (!s_singleContextMode || s_sharedHGLRC == NULL)
-			m_hGLRC = ::wglCreateContext(m_hDC);
-		else
-			m_hGLRC = s_sharedHGLRC;
-	}
-#endif // WITH_LEGACY_OPENGL
 
 	if (!WIN32_CHK(m_hGLRC != NULL)) {
 		::wglMakeCurrent(prevHDC, prevHGLRC);
@@ -946,13 +929,7 @@ GHOST_TSuccess GHOST_ContextWGL::initializeDrawingContext()
 		           MB_OK | MB_ICONERROR);
 		exit(0);
 	}
-#if defined(WITH_LEGACY_OPENGL)
-	else if (version[0] < '3') {
-		// relax requirements for Mesa, which uses GL 3.0
-		// while other drivers use GL 3.3+ compatibility profile
-#else
 	else if (version[0] < '3' || (version[0] == '3' && version[2] < '3')) {
-#endif
 		MessageBox(m_hWnd, "Blender requires a graphics driver with OpenGL 3.3 support.\n\n"
 		                   "The program will now close.",
 		           "Blender - Unsupported Graphics Driver!",
diff --git a/intern/ghost/intern/GHOST_WindowX11.cpp b/intern/ghost/intern/GHOST_WindowX11.cpp
index 11f3a6ea406..450fe568814 100644
--- a/intern/ghost/intern/GHOST_WindowX11.cpp
+++ b/intern/ghost/intern/GHOST_WindowX11.cpp
@@ -1386,25 +1386,6 @@ GHOST_Context *GHOST_WindowX11::newDrawingContext(GHOST_TDrawingContextType type
 		else
 			delete context;
 
-#ifdef WITH_LEGACY_OPENGL
-		// since that failed try 3.0 (mostly for Mesa, which doesn't implement compatibility profile)
-		context = new GHOST_ContextGLX(
-		        m_wantStereoVisual,
-		        m_wantNumOfAASamples,
-		        m_window,
-		        m_display,
-		        m_visualInfo,
-		        (GLXFBConfig)m_fbconfig,
-		        0, // no profile bit
-		        3, 0,
-		        GHOST_OPENGL_GLX_CONTEXT_FLAGS | (m_is_debug_context ? GLX_CONTEXT_DEBUG_BIT_ARB : 0),
-		        GHOST_OPENGL_GLX_RESET_NOTIFICATION_STRATEGY);
-
-		if (context->initializeDrawingContext())
-			return context;
-		else
-			delete context;
-#endif // WITH_LEGACY_OPENGL
 	}
 
 	return NULL;
diff --git a/intern/opensubdiv/opensubdiv_gpu_capi.cc b/intern/opensubdiv/opensubdiv_gpu_capi.cc
index 32474d7cb60..811cd18745e 100644
--- a/intern/opensubdiv/opensubdiv_gpu_capi.cc
+++ b/intern/opensubdiv/opensubdiv_gpu_capi.cc
@@ -344,27 +344,6 @@ void bindProgram(OpenSubdiv_GLMesh *gl_mesh, int program)
 	glBindBufferBase(GL_UNIFORM_BUFFER, 0, g_lighting_ub);
 
 	/* Color */
-#ifdef WITH_LEGACY_OPENGL
-	GLboolean use_lighting;
-	glGetBooleanv(GL_LIGHTING, &use_lighting);
-
-	if (use_lighting) {
-		float color[4];
-		glGetMaterialfv(GL_FRONT, GL_DIFFUSE, color);
-		glUniform4fv(glGetUniformLocation(program, "diffuse"), 1, color);
-
-		glGetMaterialfv(GL_FRONT, GL_SPECULAR, color);
-		glUniform4fv(glGetUniformLocation(program, "specular"), 1, color);
-
-		glGetMaterialfv(GL_FRONT, GL_SHININESS, color);
-		glUniform1f(glGetUniformLocation(program, "shininess"), color[0]);
-	}
-	else {
-		float color[4];
-		glGetFloatv(GL_CURRENT_COLOR, color);
-		glUniform4fv(glGetUniformLocation(program, "diffuse"), 1, color);
-	}
-#else
 	{
 		/* TODO: stop using glGetMaterial */
 		float color[4];
@@ -377,7 +356,6 @@ void bindProgram(OpenSubdiv_GLMesh *gl_mesh, int program)
 		glGetMaterialfv(GL_FRONT, GL_SHININESS, color);
 		glUniform1f(glGetUniformLocation(program, "shininess"), color[0]);
 	}
-#endif
 
 	/* Face-vertex data */
 	if (gl_mesh->fvar_data != NULL) {
@@ -642,33 +620,6 @@ static GLuint prepare_patchDraw(OpenSubdiv_GLMesh *gl_mesh,
 		glGetIntegerv(GL_SHADE_MODEL, &model);
 		glGetBooleanv(GL_TEXTURE_2D, &use_texture_2d);
 
-#ifdef WITH_LEGACY_OPENGL
-		glGetBooleanv(GL_LIGHTING, &use_lighting);
-		if (model == GL_FLAT) {
-			if (use_texture_2d) {
-				program = use_lighting
-				                  ? g_flat_fill_texture2d_program
-				                  : g_flat_fill_texture2d_shadeless_program;
-			}
-			else {
-				program = use_lighting
-				                  ? g_flat_fill_solid_program
-				                  : g_flat_fill_solid_shadeless_program;
-			}
-		}
-		else {
-			if (use_texture_2d) {
-				program = use_lighting
-				                  ? g_smooth_fill_texture2d_program
-				                  : g_smooth_fill_texture2d_shadeless_program;
-			}
-			else {
-				program = use_lighting
-				                  ? g_smooth_fill_solid_program
-				                  : g_smooth_fill_solid_shadeless_program;
-			}
-		}
-#else
 		if (model == GL_FLAT) {
 			if (use_texture_2d) {
 				program = g_flat_fill_texture2d_program;
@@ -685,7 +636,6 @@ static GLuint prepare_patchDraw(OpenSubdiv_GLMesh *gl_mesh,
 				program = g_smooth_fill_solid_program;
 			}
 		}
-#endif
 
 	}
 	else {