diff options
| author | Christoph Bumiller <e0425955@student.tuwien.ac.at> | 2010-09-15 17:34:40 +0200 |
|---|---|---|
| committer | Christoph Bumiller <e0425955@student.tuwien.ac.at> | 2010-09-15 17:34:40 +0200 |
| commit | 26fe16a99b762d27e8f499c2e02116e9c4b7a6bb (patch) | |
| tree | 153d15f0e24f349d2ba6ec736ed5e4b8b961e824 /src/gallium/drivers/nv50/nv50_screen.h | |
| parent | 59ca1ae84b2c15c8a94211da158f563e45560bcd (diff) | |
| parent | 84d170bbcef8e26017ac8e2f3bacbaeb20f889d3 (diff) | |
Merge remote branch 'origin/nv50-compiler'
Conflicts:
src/gallium/drivers/nouveau/nouveau_class.h
src/gallium/drivers/nv50/nv50_screen.c
Diffstat (limited to 'src/gallium/drivers/nv50/nv50_screen.h')
| -rw-r--r-- | src/gallium/drivers/nv50/nv50_screen.h | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/src/gallium/drivers/nv50/nv50_screen.h b/src/gallium/drivers/nv50/nv50_screen.h index fbf15a7596..ad6bdeb27c 100644 --- a/src/gallium/drivers/nv50/nv50_screen.h +++ b/src/gallium/drivers/nv50/nv50_screen.h @@ -22,11 +22,12 @@ struct nv50_screen { struct nouveau_resource *immd_heap; - struct pipe_resource *strm_vbuf[16]; - struct nouveau_bo *tic; struct nouveau_bo *tsc; + struct nouveau_bo *stack_bo; /* control flow stack */ + struct nouveau_bo *local_bo; /* l[] memory */ + boolean force_push; }; @@ -38,4 +39,13 @@ nv50_screen(struct pipe_screen *screen) extern void nv50_screen_relocs(struct nv50_screen *); +struct nv50_format { + uint32_t rt; + uint32_t tic; + uint32_t vtx; + uint32_t usage; +}; + +extern const struct nv50_format nv50_format_table[]; + #endif |