projects / mesa.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
nouveau: include stdio.h and u_inlines.h in all context files since embedded changes
[mesa.git] / src / gallium / drivers / nv50 / nv50_context.h
diff --git a/src/gallium/drivers/nv50/nv50_context.h b/src/gallium/drivers/nv50/nv50_context.h
index 1e9e8e49bfbd2c174cec3d7c2e6f2d3d0320b826..44d8f61342706111cdd2e454352ceb875f2e76b8 100644 (file)
--- a/src/gallium/drivers/nv50/nv50_context.h
+++ b/src/gallium/drivers/nv50/nv50_context.h
@@ -1,6 +1,7 @@
 #ifndef __NV50_CONTEXT_H__
 #define __NV50_CONTEXT_H__
 
+#include <stdio.h>
 #include "pipe/p_context.h"
 #include "pipe/p_defines.h"
 #include "pipe/p_state.h"
@@ -8,12 +9,14 @@
 
 #include "util/u_memory.h"
 #include "util/u_math.h"
+#include "util/u_inlines.h"
 
 #include "draw/draw_vertex.h"
 
 #include "nouveau/nouveau_winsys.h"
 #include "nouveau/nouveau_gldefs.h"
 #include "nouveau/nouveau_stateobj.h"
+#include "nouveau/nouveau_context.h"
 
 #include "nv50_screen.h"
 #include "nv50_program.h"
@@ -28,9 +31,7 @@
 #define NV50_CB_PVP            1
 #define NV50_CB_PFP            2
 #define NV50_CB_PGP            3
-#define NV50_CB_TIC            4
-#define NV50_CB_TSC            5
-#define NV50_CB_PUPLOAD         6
+#define NV50_CB_AUX            4
 
 #define NV50_NEW_BLEND         (1 << 0)
 #define NV50_NEW_ZSA           (1 << 1)
@@ -44,9 +45,11 @@
 #define NV50_NEW_VERTPROG_CB   (1 << 9)
 #define NV50_NEW_FRAGPROG      (1 << 10)
 #define NV50_NEW_FRAGPROG_CB   (1 << 11)
-#define NV50_NEW_ARRAYS                (1 << 12)
-#define NV50_NEW_SAMPLER       (1 << 13)
-#define NV50_NEW_TEXTURE       (1 << 14)
+#define NV50_NEW_GEOMPROG      (1 << 12)
+#define NV50_NEW_GEOMPROG_CB   (1 << 13)
+#define NV50_NEW_ARRAYS                (1 << 14)
+#define NV50_NEW_SAMPLER       (1 << 15)
+#define NV50_NEW_TEXTURE       (1 << 16)
 
 struct nv50_blend_stateobj {
        struct pipe_blend_state pipe;
@@ -64,10 +67,22 @@ struct nv50_rasterizer_stateobj {
 };
 
 struct nv50_sampler_stateobj {
-       bool normalized;
+       boolean normalized;
        unsigned tsc[8];
 };
 
+static INLINE unsigned
+get_tile_height(uint32_t tile_mode)
+{
+        return 1 << ((tile_mode & 0xf) + 2);
+}
+
+static INLINE unsigned
+get_tile_depth(uint32_t tile_mode)
+{
+        return 1 << (tile_mode >> 4);
+}
+
 struct nv50_miptree_level {
        int *image_offset;
        unsigned pitch;
@@ -113,12 +128,17 @@ struct nv50_state {
        unsigned viewport_bypass;
        struct nouveau_stateobj *tsc_upload;
        struct nouveau_stateobj *tic_upload;
-       unsigned miptree_nr;
+       unsigned miptree_nr[PIPE_SHADER_TYPES];
        struct nouveau_stateobj *vertprog;
        struct nouveau_stateobj *fragprog;
+       struct nouveau_stateobj *geomprog;
+       struct nouveau_stateobj *fp_linkage;
+       struct nouveau_stateobj *gp_linkage;
        struct nouveau_stateobj *vtxfmt;
        struct nouveau_stateobj *vtxbuf;
        struct nouveau_stateobj *vtxattr;
+       struct nouveau_stateobj *instbuf;
+       unsigned vtxelt_nr;
 };
 
 struct nv50_context {
@@ -142,15 +162,18 @@ struct nv50_context {
        struct pipe_framebuffer_state framebuffer;
        struct nv50_program *vertprog;
        struct nv50_program *fragprog;
+       struct nv50_program *geomprog;
        struct pipe_buffer *constbuf[PIPE_SHADER_TYPES];
        struct pipe_vertex_buffer vtxbuf[PIPE_MAX_ATTRIBS];
        unsigned vtxbuf_nr;
        struct pipe_vertex_element vtxelt[PIPE_MAX_ATTRIBS];
        unsigned vtxelt_nr;
-       struct nv50_sampler_stateobj *sampler[PIPE_MAX_SAMPLERS];
-       unsigned sampler_nr;
-       struct nv50_miptree *miptree[PIPE_MAX_SAMPLERS];
-       unsigned miptree_nr;
+       struct nv50_sampler_stateobj *sampler[PIPE_SHADER_TYPES][PIPE_MAX_SAMPLERS];
+       unsigned sampler_nr[PIPE_SHADER_TYPES];
+       struct nv50_miptree *miptree[PIPE_SHADER_TYPES][PIPE_MAX_SAMPLERS];
+       unsigned miptree_nr[PIPE_SHADER_TYPES];
+
+       uint16_t vbo_fifo;
 };
 
 static INLINE struct nv50_context *
@@ -174,13 +197,24 @@ nv50_surface_do_copy(struct nv50_screen *screen, struct pipe_surface *dst,
 extern struct draw_stage *nv50_draw_render_stage(struct nv50_context *nv50);
 
 /* nv50_vbo.c */
-extern boolean nv50_draw_arrays(struct pipe_context *, unsigned mode,
+extern void nv50_draw_arrays(struct pipe_context *, unsigned mode,
                                unsigned start, unsigned count);
-extern boolean nv50_draw_elements(struct pipe_context *pipe,
+extern void nv50_draw_arrays_instanced(struct pipe_context *, unsigned mode,
+                                       unsigned start, unsigned count,
+                                       unsigned startInstance,
+                                       unsigned instanceCount);
+extern void nv50_draw_elements(struct pipe_context *pipe,
                                  struct pipe_buffer *indexBuffer,
                                  unsigned indexSize,
                                  unsigned mode, unsigned start,
                                  unsigned count);
+extern void nv50_draw_elements_instanced(struct pipe_context *pipe,
+                                        struct pipe_buffer *indexBuffer,
+                                        unsigned indexSize,
+                                        unsigned mode, unsigned start,
+                                        unsigned count,
+                                        unsigned startInstance,
+                                        unsigned instanceCount);
 extern void nv50_vbo_validate(struct nv50_context *nv50);
 
 /* nv50_clear.c */
@@ -190,12 +224,30 @@ extern void nv50_clear(struct pipe_context *pipe, unsigned buffers,
 /* nv50_program.c */
 extern void nv50_vertprog_validate(struct nv50_context *nv50);
 extern void nv50_fragprog_validate(struct nv50_context *nv50);
-extern void nv50_program_destroy(struct nv50_context *nv50, struct nv50_program *p);
+extern void nv50_geomprog_validate(struct nv50_context *nv50);
+extern void nv50_fp_linkage_validate(struct nv50_context *nv50);
+extern void nv50_gp_linkage_validate(struct nv50_context *nv50);
+extern void nv50_program_destroy(struct nv50_context *nv50,
+                                struct nv50_program *p);
 
 /* nv50_state_validate.c */
 extern boolean nv50_state_validate(struct nv50_context *nv50);
+extern void nv50_state_flush_notify(struct nouveau_channel *chan);
+
+extern void nv50_so_init_sifc(struct nv50_context *nv50,
+                             struct nouveau_stateobj *so,
+                             struct nouveau_bo *bo, unsigned reloc,
+                             unsigned offset, unsigned size);
 
 /* nv50_tex.c */
 extern void nv50_tex_validate(struct nv50_context *);
 
+/* nv50_transfer.c */
+extern void
+nv50_upload_sifc(struct nv50_context *nv50,
+                struct nouveau_bo *bo, unsigned dst_offset, unsigned reloc,
+                unsigned dst_format, int dst_w, int dst_h, int dst_pitch,
+                void *src, unsigned src_format, int src_pitch,
+                int x, int y, int w, int h, int cpp);
+
 #endif