From: Ian Romanick <ian.d.romanick@intel.com>
Date: Wed, 8 Aug 2012 16:11:05 +0000 (-0700)
Subject: i965: Advertise GLSL 1.40 and TexBOs in core contexts
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2a33a997376e1b628ad91e609a090bedf5964704;p=mesa.git

i965: Advertise GLSL 1.40 and TexBOs in core contexts

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
---

diff --git a/src/mesa/drivers/dri/intel/intel_extensions.c b/src/mesa/drivers/dri/intel/intel_extensions.c
index 804a8cf4740..885e8a43e80 100755
--- a/src/mesa/drivers/dri/intel/intel_extensions.c
+++ b/src/mesa/drivers/dri/intel/intel_extensions.c
@@ -94,7 +94,11 @@ intelInitExtensions(struct gl_context *ctx)
    ctx->Extensions.ARB_texture_rgb10_a2ui = true;
 
    if (intel->gen >= 6)
-      ctx->Const.GLSLVersion = 130;
+      if (ctx->API == API_OPENGL_CORE) {
+         ctx->Const.GLSLVersion = 140;
+      } else {
+         ctx->Const.GLSLVersion = 130;
+      }
    else
       ctx->Const.GLSLVersion = 120;
    _mesa_override_glsl_version(ctx);
@@ -107,6 +111,10 @@ intelInitExtensions(struct gl_context *ctx)
       ctx->Extensions.ARB_blend_func_extended = !driQueryOptionb(&intel->optionCache, "disable_blend_func_extended");
       ctx->Extensions.ARB_draw_buffers_blend = true;
       ctx->Extensions.ARB_uniform_buffer_object = true;
+
+      if (ctx->API == API_OPENGL_CORE) {
+         ctx->Extensions.ARB_texture_buffer_object = true;
+      }
    }
 
    if (intel->gen >= 5)