diff options
| author | Brian Paul <[email protected]> | 2011-01-15 10:24:08 -0700 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2011-01-15 10:24:08 -0700 |
| commit | 652901e95b4ed406293d0e1fabee857c054119b1 (patch) | |
| tree | a4b40b134f7c6491cd8d9fe37590e99428d8fab5 /src/gallium/docs/source/screen.rst | |
| parent | 21001d2ba79be26f565a6795a907ec266564f4cd (diff) | |
| parent | b7c38734c9d85f9dad1796d97690be2d9c55c397 (diff) | |
Merge branch 'draw-instanced'
Conflicts:
src/gallium/auxiliary/draw/draw_llvm.c
src/gallium/drivers/llvmpipe/lp_state_fs.c
src/glsl/ir_set_program_inouts.cpp
src/mesa/tnl/t_vb_program.c
Diffstat (limited to 'src/gallium/docs/source/screen.rst')
| -rw-r--r-- | src/gallium/docs/source/screen.rst | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gallium/docs/source/screen.rst b/src/gallium/docs/source/screen.rst index 09edbaa673d..ab90097add6 100644 --- a/src/gallium/docs/source/screen.rst +++ b/src/gallium/docs/source/screen.rst @@ -36,6 +36,7 @@ The integer capabilities: bound. * ``OCCLUSION_QUERY``: Whether occlusion queries are available. * ``TIMER_QUERY``: Whether timer queries are available. +* ``INSTANCED_DRAWING``: indicates support for instanced drawing. * ``TEXTURE_SHADOW_MAP``: indicates whether the fragment shader hardware can do the depth texture / Z comparison operation in TEX instructions for shadow testing. |