diff options
| author | Luca Barbieri <[email protected]> | 2010-08-03 06:24:22 +0200 |
|---|---|---|
| committer | Luca Barbieri <[email protected]> | 2010-08-21 20:42:14 +0200 |
| commit | 9ed0686e8e6157ce38c9fa284cd7399289a2e698 (patch) | |
| tree | edeb174d369b7eeeefc457077668cfbeaa6a8ee2 /src/gallium/drivers/nvfx/nvfx_context.h | |
| parent | 24a4ea003f14a96ed07fdc4e92a67610655befad (diff) | |
nvfx: new 2D: use new 2D engine in Gallium
This patch implements nv04_surface_copy/fill using the new 2D engine module.
It supports falling back to the 3D engine using the u_blitter module, which will be
added in a later patch.
Also adds support for using the 3D engine, reusing the u_blitter module
created for r300.
This is used for unswizzling and copies between swizzled surfaces.
Diffstat (limited to 'src/gallium/drivers/nvfx/nvfx_context.h')
| -rw-r--r-- | src/gallium/drivers/nvfx/nvfx_context.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gallium/drivers/nvfx/nvfx_context.h b/src/gallium/drivers/nvfx/nvfx_context.h index 89f94c10bd1..278be94d525 100644 --- a/src/gallium/drivers/nvfx/nvfx_context.h +++ b/src/gallium/drivers/nvfx/nvfx_context.h @@ -13,6 +13,7 @@ #include "util/u_inlines.h" #include "draw/draw_vertex.h" +#include "util/u_blitter.h" #include "nouveau/nouveau_winsys.h" #include "nouveau/nouveau_gldefs.h" @@ -88,6 +89,7 @@ struct nvfx_context { unsigned is_nv4x; /* either 0 or ~0 */ struct draw_context *draw; + struct blitter_context* blitter; /* HW state derived from pipe states */ struct nvfx_state state; |