diff options
| author | Brian Paul <brianp@vmware.com> | 2010-10-21 19:05:40 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2010-10-21 19:05:47 -0600 |
| commit | 69a07be3e527dbc2148a4e20c50e60266225f5f2 (patch) | |
| tree | 82583b98708fc7a6c33b471d45670e2566ed0daf /src/gallium/include/pipe/p_defines.h | |
| parent | 1d91f8d9164b38b4c924f43ec4fc5ceb65c96a78 (diff) | |
| parent | b2d4dfe5cc5b24743175bf35285dfc57f86bc09d (diff) | |
Merge branch 'primitive-restart-cleanup'
Conflicts:
docs/relnotes-7.10.html
This branch is a re-do of the primitive-restart branch with all
the intermediate/temporary stuff cleaned out.
Diffstat (limited to 'src/gallium/include/pipe/p_defines.h')
| -rw-r--r-- | src/gallium/include/pipe/p_defines.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gallium/include/pipe/p_defines.h b/src/gallium/include/pipe/p_defines.h index b6894c09e8..53f7b601ad 100644 --- a/src/gallium/include/pipe/p_defines.h +++ b/src/gallium/include/pipe/p_defines.h @@ -452,6 +452,7 @@ enum pipe_cap { PIPE_CAP_BLEND_EQUATION_SEPARATE, PIPE_CAP_SM3, /*< Shader Model, supported */ PIPE_CAP_STREAM_OUTPUT, + PIPE_CAP_PRIMITIVE_RESTART, /** Maximum texture image units accessible from vertex and fragment shaders * combined */ PIPE_CAP_MAX_COMBINED_SAMPLERS, |