summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorIan Romanick <[email protected]>2012-08-08 09:11:05 -0700
committerIan Romanick <[email protected]>2012-08-29 15:09:38 -0700
commit2a33a997376e1b628ad91e609a090bedf5964704 (patch)
tree3861faf30190c5e5b5f32d6bfcdf3dd5748062e9 /src
parent91473485fcf3e2cef465784ae5581787a2a8a3b3 (diff)
i965: Advertise GLSL 1.40 and TexBOs in core contexts
Signed-off-by: Ian Romanick <[email protected]>
Diffstat (limited to 'src')
-rwxr-xr-xsrc/mesa/drivers/dri/intel/intel_extensions.c10
1 files changed, 9 insertions, 1 deletions
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)