From 0e0d66446194ab0b2d114dc83e76ec9c9b1a01f1 Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Tue, 7 Aug 2012 12:50:44 -0700 Subject: [PATCH] i965: Allow creation of OpenGL 3.1 contexts v2: Fix API_OPENGL_CORE handling when TEXTURE_FLOAT_ENABLED is not defined. Based on review feedback from Eric Anholt. Signed-off-by: Ian Romanick Reviewed-by: Eric Anholt --- src/mesa/drivers/dri/i965/brw_context.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c index 8d2e5c9..4e5aed6 100644 --- a/src/mesa/drivers/dri/i965/brw_context.c +++ b/src/mesa/drivers/dri/i965/brw_context.c @@ -109,6 +109,25 @@ brwCreateContext(int api, case API_OPENGLES: case API_OPENGLES2: break; + case API_OPENGL_CORE: { +#ifdef TEXTURE_FLOAT_ENABLED + const unsigned max_version = + (screen->gen == 6 || + (screen->gen == 7 && screen->kernel_has_gen7_sol_reset)) + ? 31 : 0; + const unsigned req_version = major_version * 10 + minor_version; + + if (req_version > max_version) { + *error = (max_version == 0) + ? __DRI_CTX_ERROR_BAD_API : __DRI_CTX_ERROR_BAD_VERSION; + return false; + } + break; +#else + *error = __DRI_CTX_ERROR_BAD_API; + return false; +#endif + } default: *error = __DRI_CTX_ERROR_BAD_API; return false; -- 2.7.4