diff options
| author | Brian Paul <brianp@vmware.com> | 2009-06-26 17:07:07 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2009-06-26 17:07:07 -0600 |
| commit | a18e209edb5348eb167e9d7184597031bbbbe622 (patch) | |
| tree | 60fcd288119f335cccdc2f15981c9b315d332e64 /src/mesa/state_tracker | |
| parent | 4fdc6ad41b843109febbe9596dde87f676a8b0e9 (diff) | |
| parent | 418987ff05f892d3c33ed4ddbe856c496b05ea14 (diff) | |
Merge branch 'mesa_7_5_branch'
Conflicts:
Makefile
src/gallium/drivers/softpipe/sp_screen.c
src/mesa/main/version.h
Diffstat (limited to 'src/mesa/state_tracker')
| -rw-r--r-- | src/mesa/state_tracker/st_extensions.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/mesa/state_tracker/st_extensions.c b/src/mesa/state_tracker/st_extensions.c index 3cc40ee884..12d9b6b874 100644 --- a/src/mesa/state_tracker/st_extensions.c +++ b/src/mesa/state_tracker/st_extensions.c @@ -120,6 +120,11 @@ void st_init_limits(struct st_context *st) c->MaxDrawBuffers = CLAMP(screen->get_param(screen, PIPE_CAP_MAX_RENDER_TARGETS), 1, MAX_DRAW_BUFFERS); + + /* Is TGSI_OPCODE_CONT supported? */ + /* XXX separate query for early function return? */ + st->ctx->Shader.EmitContReturn = + screen->get_param(screen, PIPE_CAP_TGSI_CONT_SUPPORTED); } |