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/state_tracker | |
| 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/state_tracker')
| -rw-r--r-- | mesalib/src/mesa/state_tracker/st_extensions.c | 4 |
1 files changed, 3 insertions, 1 deletions
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;
}
}
|