diff options
| author | Michal Krol <michal@vmware.com> | 2009-12-12 16:48:32 +0100 |
|---|---|---|
| committer | Michal Krol <michal@vmware.com> | 2009-12-12 16:48:32 +0100 |
| commit | a3eb0f718e19653a2ad8e49396c904183be456f3 (patch) | |
| tree | 0092574c469ea586a6cab8b8ebb7ac62b8221a2a /doxygen | |
| parent | 491f384c3958067e6c4c994041f5d8d413b806bc (diff) | |
| parent | 784cca9fa527de771754d76545970f78094b9adf (diff) | |
Merge branch 'master' into glsl-pp-rework-2
Conflicts:
progs/perf/drawoverhead.c
progs/perf/teximage.c
progs/perf/vbo.c
progs/perf/vertexrate.c
src/mesa/shader/slang/library/slang_common_builtin_gc.h
Diffstat (limited to 'doxygen')
| -rw-r--r-- | doxygen/gallium.doc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/doxygen/gallium.doc b/doxygen/gallium.doc index 4c1434460e..f0ff36075a 100644 --- a/doxygen/gallium.doc +++ b/doxygen/gallium.doc @@ -33,8 +33,7 @@ - Pipe drivers: - \ref softpipe - - \ref i915simple - - Simple 965 driver (brw_context.h, brw_winsys.h) + - \ref i915g - Cell driver (cell_context.h, cell_winsys.h) - \ref failover @@ -120,7 +119,7 @@ \sa sp_winsys.h */ -/** \page i915simple Simple i915 Driver +/** \page i915g i915 Driver The i915 Gallium3D Driver is an initial hardware driver implementation within the Gallium3D driver architecture. We expect that once complete this driver @@ -163,7 +162,7 @@ The Draw module is effectively the part of \ref softpipe which is concerned with vertex processing, split off into a separate module so that it can be reused by drivers for rasterization-only hardware. As such it is also instantiated - by the \ref i915simple driver. + by the \ref i915g driver. Additionally, there are cases in the Mesa OpenGL state_tracker where it is required to obtain transformed vertices and yet it is anticipated that using |