diff options
| author | Christoph Bumiller <[email protected]> | 2012-04-14 23:56:56 +0200 |
|---|---|---|
| committer | Christoph Bumiller <[email protected]> | 2012-04-15 00:08:51 +0200 |
| commit | e44089b2f79aa2dcaacf348911433d1e21235c0c (patch) | |
| tree | 955d621392f0068ef8e3c98dc46195ff3916525e /src/gallium/drivers/nvc0/nvc0_context.h | |
| parent | 69a921892d2303f1400576aa73980c28880f8654 (diff) | |
nvc0: add initial support for nve4+ (Kepler) chipsets
Most things that work on Fermi should work on Kepler too.
There are a few performance optimizations left to do, like better
placement of texture barriers and adding scheduling data to the
shader instructions (without them, a thread group will be masked
for 32 cycles after each single instruction issue).
Diffstat (limited to 'src/gallium/drivers/nvc0/nvc0_context.h')
| -rw-r--r-- | src/gallium/drivers/nvc0/nvc0_context.h | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/src/gallium/drivers/nvc0/nvc0_context.h b/src/gallium/drivers/nvc0/nvc0_context.h index 7072b5918fa..140ce1ac7ef 100644 --- a/src/gallium/drivers/nvc0/nvc0_context.h +++ b/src/gallium/drivers/nvc0/nvc0_context.h @@ -27,7 +27,9 @@ #include "nvc0_3d.xml.h" #include "nvc0_2d.xml.h" #include "nvc0_m2mf.xml.h" +#include "nve4_p2mf.xml.h" +/* NOTE: must keep NVC0_NEW_...PROG in consecutive bits in this order */ #define NVC0_NEW_BLEND (1 << 0) #define NVC0_NEW_RASTERIZER (1 << 1) #define NVC0_NEW_ZSA (1 << 2) @@ -75,6 +77,11 @@ struct nvc0_context { struct nvc0_screen *screen; + void (*m2mf_copy_rect)(struct nvc0_context *, + const struct nv50_m2mf_rect *dst, + const struct nv50_m2mf_rect *src, + uint32_t nblocksx, uint32_t nblocksy); + uint32_t dirty; struct { @@ -130,6 +137,8 @@ struct nvc0_context { unsigned num_samplers[5]; uint16_t samplers_dirty[5]; + uint32_t tex_handles[5][PIPE_MAX_SAMPLERS]; /* for nve4 */ + struct pipe_framebuffer_state framebuffer; struct pipe_blend_color blend_colour; struct pipe_stencil_ref stencil_ref; @@ -165,7 +174,7 @@ void nvc0_default_kick_notify(struct nouveau_pushbuf *); extern struct draw_stage *nvc0_draw_render_stage(struct nvc0_context *); /* nvc0_program.c */ -boolean nvc0_program_translate(struct nvc0_program *); +boolean nvc0_program_translate(struct nvc0_program *, uint16_t chipset); boolean nvc0_program_upload_code(struct nvc0_context *, struct nvc0_program *); void nvc0_program_destroy(struct nvc0_context *, struct nvc0_program *); void nvc0_program_library_upload(struct nvc0_context *); @@ -206,6 +215,7 @@ extern void nvc0_init_surface_functions(struct nvc0_context *); /* nvc0_tex.c */ void nvc0_validate_textures(struct nvc0_context *); void nvc0_validate_samplers(struct nvc0_context *); +void nve4_set_tex_handles(struct nvc0_context *); struct pipe_sampler_view * nvc0_create_sampler_view(struct pipe_context *, @@ -214,19 +224,16 @@ nvc0_create_sampler_view(struct pipe_context *, /* nvc0_transfer.c */ void -nvc0_m2mf_transfer_rect(struct nvc0_context *, - const struct nv50_m2mf_rect *dst, - const struct nv50_m2mf_rect *src, - uint32_t nblocksx, uint32_t nblocksy); +nvc0_init_transfer_functions(struct nvc0_context *); + void nvc0_m2mf_push_linear(struct nouveau_context *nv, struct nouveau_bo *dst, unsigned offset, unsigned domain, unsigned size, const void *data); void -nvc0_m2mf_copy_linear(struct nouveau_context *nv, - struct nouveau_bo *dst, unsigned dstoff, unsigned dstdom, - struct nouveau_bo *src, unsigned srcoff, unsigned srcdom, - unsigned size); +nve4_p2mf_push_linear(struct nouveau_context *nv, + struct nouveau_bo *dst, unsigned offset, unsigned domain, + unsigned size, const void *data); void nvc0_cb_push(struct nouveau_context *, struct nouveau_bo *bo, unsigned domain, |