On 10/11/2016 02:02 AM, Iago Toral Quiroga wrote: > ARB_gpu_shader_fp64 was the last piece missing. Notice that some > hardware and kernel combinations do not support pipelined register > writes, which are required for some OpenGL 4.0 features, in which > case the driver won't expose 4.0. > --- > src/mesa/drivers/dri/i965/intel_extensions.c | 2 ++ > src/mesa/drivers/dri/i965/intel_screen.c | 2 +- > 2 files changed, 3 insertions(+), 1 deletion(-) > > diff --git a/src/mesa/drivers/dri/i965/intel_extensions.c > b/src/mesa/drivers/dri/i965/intel_extensions.c > index 0491145..a291cd5 100644 > --- a/src/mesa/drivers/dri/i965/intel_extensions.c > +++ b/src/mesa/drivers/dri/i965/intel_extensions.c > @@ -272,6 +272,8 @@ intelInitExtensions(struct gl_context *ctx) > > if (brw->gen >= 8) > ctx->Const.GLSLVersion = 440; > + else if (brw->is_haswell) > + ctx->Const.GLSLVersion = 400; > else if (brw->gen >= 6) > ctx->Const.GLSLVersion = 330; > else > diff --git a/src/mesa/drivers/dri/i965/intel_screen.c > b/src/mesa/drivers/dri/i965/intel_screen.c > index 9b23bac..1af7fe6 100644 > --- a/src/mesa/drivers/dri/i965/intel_screen.c > +++ b/src/mesa/drivers/dri/i965/intel_screen.c > @@ -1445,7 +1445,7 @@ set_max_gl_versions(struct intel_screen *screen) > dri_screen->max_gl_es2_version = has_astc ? 32 : 31; > break; > case 7: > - dri_screen->max_gl_core_version = 33; > + dri_screen->max_gl_core_version = screen->devinfo.is_haswell ? 40 : 33;
I *think* this needs to take the pipelined register writes into consideration. My understanding is if you say 40 here, then glXCreateContextAttribs will allow creation of an OpenGL 4.0 context... but the context may only be 3.3. > dri_screen->max_gl_compat_version = 30; > dri_screen->max_gl_es1_version = 11; > dri_screen->max_gl_es2_version = screen->devinfo.is_haswell ? 31 : 30; > _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
