On Fri, Jun 8, 2012 at 9:10 PM, Ian Romanick <[email protected]> wrote: > From: Ian Romanick <[email protected]> > > Signed-off-by: Ian Romanick <[email protected]>
Looks like a piglit test for this would be good, if there isn't one, if there is it would be good to mention it. but it looks fine, Reviewed-by: Dave Airlie <[email protected]> > --- > glx/createcontext.c | 17 +++++++++++++++++ > 1 files changed, 17 insertions(+), 0 deletions(-) > > diff --git a/glx/createcontext.c b/glx/createcontext.c > index 8f7dc05..4a6e1b5 100644 > --- a/glx/createcontext.c > +++ b/glx/createcontext.c > @@ -270,6 +270,23 @@ __glXDisp_CreateContextAttribsARB(__GLXclientState * cl, > GLbyte * pc) > return __glXError(GLXBadProfileARB); > } > > + /* There is no GLX protocol for desktop OpenGL versions after 1.4. There > + * is no GLX protocol for any version of OpenGL ES. If the application > is > + * requested an indirect rendering context for a version that cannot be > + * satisfied, reject it. > + * > + * The GLX_ARB_create_context spec says: > + * > + * "* If <config> does not support compatible OpenGL contexts > + * providing the requested API major and minor version, > + * forward-compatible flag, and debug context flag, GLXBadFBConfig > + * is generated." > + */ > + if (!req->isDirect && (major_version > 1 || minor_version > 4 > + || profile == GLX_CONTEXT_ES2_PROFILE_BIT_EXT)) { > + return __glXError(GLXBadFBConfig); > + } > + > /* Allocate memory for the new context > */ > if (req->isDirect) { > -- > 1.7.6.5 > > _______________________________________________ > [email protected]: X.Org development > Archives: http://lists.x.org/archives/xorg-devel > Info: http://lists.x.org/mailman/listinfo/xorg-devel _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
