diff options
| author | marha <marha@users.sourceforge.net> | 2011-03-07 07:40:39 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-03-07 07:40:39 +0000 |
| commit | 4f70194d203322cf1ec38767098976797c116f0c (patch) | |
| tree | caf54322d821e7ef7b596cf62e0e45826ec3fbbc /mesalib/src/mesa | |
| parent | b6bc795c211112d5365ce3622a8aa0d1b0344dcf (diff) | |
| parent | d550ff64af08efb189450fa7b7104b3e049b5779 (diff) | |
| download | vcxsrv-4f70194d203322cf1ec38767098976797c116f0c.tar.gz vcxsrv-4f70194d203322cf1ec38767098976797c116f0c.tar.bz2 vcxsrv-4f70194d203322cf1ec38767098976797c116f0c.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'mesalib/src/mesa')
| -rw-r--r-- | mesalib/src/mesa/drivers/dri/common/utils.c | 3 | ||||
| -rw-r--r-- | mesalib/src/mesa/state_tracker/st_extensions.c | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/mesalib/src/mesa/drivers/dri/common/utils.c b/mesalib/src/mesa/drivers/dri/common/utils.c index 02c8cc6f5..a36f65da4 100644 --- a/mesalib/src/mesa/drivers/dri/common/utils.c +++ b/mesalib/src/mesa/drivers/dri/common/utils.c @@ -650,6 +650,8 @@ driCreateConfigs(GLenum fb_format, GLenum fb_type, __DRI_ATTRIB_TEXTURE_1D_BIT |
__DRI_ATTRIB_TEXTURE_2D_BIT |
__DRI_ATTRIB_TEXTURE_RECTANGLE_BIT;
+
+ modes->sRGBCapable = GL_FALSE;
}
}
}
@@ -729,6 +731,7 @@ static const struct { unsigned int attrib, offset; } attribMap[] = { __ATTRIB(__DRI_ATTRIB_BIND_TO_MIPMAP_TEXTURE, bindToMipmapTexture),
__ATTRIB(__DRI_ATTRIB_BIND_TO_TEXTURE_TARGETS, bindToTextureTargets),
__ATTRIB(__DRI_ATTRIB_YINVERTED, yInverted),
+ __ATTRIB(__DRI_ATTRIB_FRAMEBUFFER_SRGB_CAPABLE, sRGBCapable),
/* The struct field doesn't matter here, these are handled by the
* switch in driGetConfigAttribIndex. We need them in the array
diff --git a/mesalib/src/mesa/state_tracker/st_extensions.c b/mesalib/src/mesa/state_tracker/st_extensions.c index 71c6c9252..511a252f0 100644 --- a/mesalib/src/mesa/state_tracker/st_extensions.c +++ b/mesalib/src/mesa/state_tracker/st_extensions.c @@ -491,8 +491,10 @@ void st_init_extensions(struct st_context *st) ctx->Extensions.ARB_shader_stencil_export = GL_TRUE;
}
- if (screen->get_param(screen, PIPE_CAP_INSTANCED_DRAWING)) {
+ if (screen->get_param(screen, PIPE_CAP_TGSI_INSTANCEID)) {
ctx->Extensions.ARB_draw_instanced = GL_TRUE;
+ }
+ if (screen->get_param(screen, PIPE_CAP_VERTEX_ELEMENT_INSTANCE_DIVISOR)) {
ctx->Extensions.ARB_instanced_arrays = GL_TRUE;
}
}
|