mirror of
https://github.com/brl/mutter.git
synced 2024-11-26 18:11:05 -05:00
win32: Remove the check for GL 1.2
Since 568c29ba4
the GL version is now validated further up in
ClutterStage via Cogl so there is no need for the Win32 backend to do
it.
This commit is contained in:
parent
62a37d8e53
commit
037192552e
@ -351,39 +351,6 @@ clutter_stage_win32_get_window_class ()
|
||||
return klass;
|
||||
}
|
||||
|
||||
static gboolean
|
||||
clutter_stage_win32_check_gl_version ()
|
||||
{
|
||||
const char *version_string, *major_end, *minor_end;
|
||||
int major = 0, minor = 0;
|
||||
|
||||
/* Get the OpenGL version number */
|
||||
if ((version_string = (const char *) glGetString (GL_VERSION)) == NULL)
|
||||
return FALSE;
|
||||
|
||||
/* Extract the major number */
|
||||
for (major_end = version_string; *major_end >= '0'
|
||||
&& *major_end <= '9'; major_end++)
|
||||
major = (major * 10) + *major_end - '0';
|
||||
/* If there were no digits or the major number isn't followed by a
|
||||
dot then it is invalid */
|
||||
if (major_end == version_string || *major_end != '.')
|
||||
return FALSE;
|
||||
|
||||
/* Extract the minor number */
|
||||
for (minor_end = major_end + 1; *minor_end >= '0'
|
||||
&& *minor_end <= '9'; minor_end++)
|
||||
minor = (minor * 10) + *minor_end - '0';
|
||||
/* If there were no digits or there is an unexpected character then
|
||||
it is invalid */
|
||||
if (minor_end == major_end + 1
|
||||
|| (*minor_end && *minor_end != ' ' && *minor_end != '.'))
|
||||
return FALSE;
|
||||
|
||||
/* Accept OpenGL 1.2 or later */
|
||||
return major > 1 || (major == 1 && minor >= 2);
|
||||
}
|
||||
|
||||
static gboolean
|
||||
clutter_stage_win32_pixel_format_is_better (const PIXELFORMATDESCRIPTOR *pfa,
|
||||
const PIXELFORMATDESCRIPTOR *pfb)
|
||||
@ -534,15 +501,6 @@ clutter_stage_win32_realize (ClutterStageWindow *stage_window)
|
||||
g_critical ("Unable to create suitable GL context");
|
||||
goto fail;
|
||||
}
|
||||
|
||||
/* Make the context current so we can check the GL version */
|
||||
wglMakeCurrent (stage_win32->client_dc, backend_win32->gl_context);
|
||||
|
||||
if (!clutter_stage_win32_check_gl_version ())
|
||||
{
|
||||
g_critical ("OpenGL version number is too low");
|
||||
goto fail;
|
||||
}
|
||||
}
|
||||
|
||||
CLUTTER_NOTE (BACKEND, "Successfully realized stage");
|
||||
|
Loading…
Reference in New Issue
Block a user