On 08/08/2012 03:14 PM, Kenneth Graunke wrote:
On 08/08/2012 10:38 AM, Ian Romanick wrote:
From: Ian Romanick <ian.d.roman...@intel.com>
Signed-off-by: Ian Romanick <ian.d.roman...@intel.com>
---
src/mesa/drivers/dri/intel/intel_extensions.c | 10 +++++++++-
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 76b56a2..10e664b 100755
--- a/src/mesa/drivers/dri/intel/intel_extensions.c
+++ b/src/mesa/drivers/dri/intel/intel_extensions.c
@@ -93,7 +93,11 @@ intelInitExtensions(struct gl_context *ctx)
ctx->Extensions.OES_compressed_ETC1_RGB8_texture = 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);
@@ -106,6 +110,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;
+ }
As it stands, this would begin advertising the ARB_texture_buffer_object
extension on 3.1. I don't think we want to do that, since the extension
specs luminance/alpha bits, and we don't support those.
It can't advertise those on 3.1 because the don't exist at all.
If you changed ARB_texture_buffer_object to GLL in extensions.c, I would
be fine with this change.
I'm a bit nervous about that because some apps may be... uh... dumb. :)
}
if (intel->gen >= 5)
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
