Commit 010008f6 authored by Zebediah Figura's avatar Zebediah Figura Committed by Alexandre Julliard

wined3d: Require GLSL 1.20 support.

parent 1eeebc31
...@@ -5308,6 +5308,9 @@ static BOOL wined3d_adapter_gl_init(struct wined3d_adapter_gl *adapter_gl, ...@@ -5308,6 +5308,9 @@ static BOOL wined3d_adapter_gl_init(struct wined3d_adapter_gl *adapter_gl,
} }
required_extensions[] = required_extensions[] =
{ {
{ARB_FRAGMENT_SHADER, "ARB_fragment_shader"},
{ARB_SHADING_LANGUAGE_100, "ARB_shading_language_100"},
{ARB_VERTEX_SHADER, "ARB_vertex_shader"},
{EXT_FRAMEBUFFER_OBJECT, "EXT_framebuffer_object"}, {EXT_FRAMEBUFFER_OBJECT, "EXT_framebuffer_object"},
}; };
...@@ -5379,6 +5382,14 @@ static BOOL wined3d_adapter_gl_init(struct wined3d_adapter_gl *adapter_gl, ...@@ -5379,6 +5382,14 @@ static BOOL wined3d_adapter_gl_init(struct wined3d_adapter_gl *adapter_gl,
} }
} }
if (gl_info->glsl_version <= MAKEDWORD_VERSION(1, 20))
{
ERR("GLSL version %s is too low; 1.20 is required.\n",
(const char *)gl_info->gl_ops.gl.p_glGetString(GL_SHADING_LANGUAGE_VERSION_ARB));
wined3d_caps_gl_ctx_destroy(&caps_gl_ctx);
return FALSE;
}
gl_info->filling_convention_offset = wined3d_adapter_find_fill_offset(&caps_gl_ctx); gl_info->filling_convention_offset = wined3d_adapter_find_fill_offset(&caps_gl_ctx);
wined3d_adapter_gl_init_d3d_info(adapter_gl, wined3d_creation_flags); wined3d_adapter_gl_init_d3d_info(adapter_gl, wined3d_creation_flags);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment