gallium: rename pipe_buffer_handle to pipe_buffer, rework pipebuffer/ code
[mesa.git] / src / mesa / pipe / p_context.h
index 33d187815805efc233f90303d04ac28112c414db..37464c88a13393b474bd1d975042bd1a61712892 100644 (file)
 
 #include "p_state.h"
 
+
 struct pipe_state_cache;
+
+/* Opaque driver handles:
+ */
+struct pipe_query;
+
 /**
- * Software pipeline rendering context.  Basically a collection of
- * state setting functions, plus VBO drawing entrypoint.
+ * Gallium rendering context.  Basically:
+ *  - state setting functions
+ *  - VBO drawing functions
+ *  - surface functions
+ *  - device queries
  */
 struct pipe_context {
    struct pipe_winsys *winsys;
 
+   void *priv;  /** context private data (for DRI for example) */
+
    void (*destroy)( struct pipe_context * );
 
    /*
     * Queries
     */
+   /** type is one of PIPE_SURFACE, PIPE_TEXTURE, etc. */
    boolean (*is_format_supported)( struct pipe_context *pipe,
-                                   uint format );
-
-   void (*max_texture_size)(struct pipe_context *pipe,
-                            unsigned textureType, /* PIPE_TEXTURE_x */
-                            unsigned *maxWidth,
-                            unsigned *maxHeight,
-                            unsigned *maxDepth);
+                                   enum pipe_format format, uint type );
 
    const char *(*get_name)( struct pipe_context *pipe );
 
    const char *(*get_vendor)( struct pipe_context *pipe );
 
    int (*get_param)( struct pipe_context *pipe, int param );
+   float (*get_paramf)( struct pipe_context *pipe, int param );
 
 
    /*
@@ -67,7 +74,7 @@ struct pipe_context {
                           unsigned mode, unsigned start, unsigned count);
 
    boolean (*draw_elements)( struct pipe_context *pipe,
-                            struct pipe_buffer_handle *indexBuffer,
+                            struct pipe_buffer *indexBuffer,
                             unsigned indexSize,
                             unsigned mode, unsigned start, unsigned count);
 
@@ -78,18 +85,23 @@ struct pipe_context {
    /**
     * Query objects
     */
-   void (*begin_query)(struct pipe_context *pipe, struct pipe_query_object *q);
-   void (*end_query)(struct pipe_context *pipe, struct pipe_query_object *q);
-   void (*wait_query)(struct pipe_context *pipe, struct pipe_query_object *q);
+   struct pipe_query *(*create_query)( struct pipe_context *pipe,
+                                              unsigned query_type );
+
+   void (*destroy_query)(struct pipe_context *pipe,
+                         struct pipe_query *q);
+
+   void (*begin_query)(struct pipe_context *pipe, struct pipe_query *q);
+   void (*end_query)(struct pipe_context *pipe, struct pipe_query *q);
+
+   boolean (*get_query_result)(struct pipe_context *pipe, 
+                               struct pipe_query *q,
+                               boolean wait,
+                               uint64 *result);
 
    /*
     * State functions
     */
-   void * (*create_alpha_test_state)(struct pipe_context *,
-                                     const struct pipe_alpha_test_state *);
-   void   (*bind_alpha_test_state)(struct pipe_context *, void *);
-   void   (*delete_alpha_test_state)(struct pipe_context *, void *);
-
    void * (*create_blend_state)(struct pipe_context *,
                                 const struct pipe_blend_state *);
    void   (*bind_blend_state)(struct pipe_context *, void *);
@@ -105,10 +117,10 @@ struct pipe_context {
    void   (*bind_rasterizer_state)(struct pipe_context *, void *);
    void   (*delete_rasterizer_state)(struct pipe_context *, void *);
 
-   void * (*create_depth_stencil_state)(struct pipe_context *,
-                                        const struct pipe_depth_stencil_state *);
-   void   (*bind_depth_stencil_state)(struct pipe_context *, void *);
-   void   (*delete_depth_stencil_state)(struct pipe_context *, void *);
+   void * (*create_depth_stencil_alpha_state)(struct pipe_context *,
+                                        const struct pipe_depth_stencil_alpha_state *);
+   void   (*bind_depth_stencil_alpha_state)(struct pipe_context *, void *);
+   void   (*delete_depth_stencil_alpha_state)(struct pipe_context *, void *);
 
    void * (*create_fs_state)(struct pipe_context *,
                              const struct pipe_shader_state *);
@@ -129,31 +141,25 @@ struct pipe_context {
    void (*set_clip_state)( struct pipe_context *,
                           const struct pipe_clip_state * );
 
-   void (*set_clear_color_state)( struct pipe_context *,
-                                  const struct pipe_clear_color_state * );
-
    void (*set_constant_buffer)( struct pipe_context *,
                                 uint shader, uint index,
                                 const struct pipe_constant_buffer *buf );
 
-   void (*set_feedback_state)( struct pipe_context *,
-                               const struct pipe_feedback_state *);
-
    void (*set_framebuffer_state)( struct pipe_context *,
                                   const struct pipe_framebuffer_state * );
 
    void (*set_polygon_stipple)( struct pipe_context *,
                                const struct pipe_poly_stipple * );
 
-   void (*set_sampler_units)( struct pipe_context *,
-                              uint num_samplers, const uint *units );
-
    void (*set_scissor_state)( struct pipe_context *,
                               const struct pipe_scissor_state * );
 
-   void (*set_texture_state)( struct pipe_context *,
-                              unsigned unit,
-                              struct pipe_mipmap_tree * );
+
+   /* Currently a sampler is constrained to sample from a single texture:
+    */
+   void (*set_sampler_texture)( struct pipe_context *,
+                               unsigned sampler,
+                               struct pipe_texture * );
 
    void (*set_viewport_state)( struct pipe_context *,
                                const struct pipe_viewport_state * );
@@ -169,16 +175,10 @@ struct pipe_context {
                               unsigned index,
                               const struct pipe_vertex_element * );
 
-   /*
-    * Vertex feedback
-    */
-   void (*set_feedback_buffer)(struct pipe_context *,
-                               unsigned index,
-                               const struct pipe_feedback_buffer *);
 
    /** Get a surface which is a "view" into a texture */
    struct pipe_surface *(*get_tex_surface)(struct pipe_context *pipe,
-                                           struct pipe_mipmap_tree *texture,
+                                           struct pipe_texture *texture,
                                            unsigned face, unsigned level,
                                            unsigned zslice);
 
@@ -192,51 +192,41 @@ struct pipe_context {
                     struct pipe_surface *ps,
                     uint x, uint y, uint w, uint h,
                     const void *p, int src_stride);
-   /* XXX temporary here, move these to softpipe */
-   void (*get_tile_rgba)(struct pipe_context *pipe, struct pipe_surface *ps,
-                         uint x, uint y, uint w, uint h, float *p);
-   void (*put_tile_rgba)(struct pipe_context *pipe, struct pipe_surface *ps,
-                         uint x, uint y, uint w, uint h, const float *p);
 
 
    /*
-    * Memory region functions
+    * Surface functions
     */
-   ubyte *(*region_map)(struct pipe_context *pipe, struct pipe_region *r);
-
-   void (*region_unmap)(struct pipe_context *pipe, struct pipe_region *r);
-
-   void (*region_data)(struct pipe_context *pipe,
-                       struct pipe_region *dest,
-                       unsigned dest_offset,
-                       unsigned destx, unsigned desty,
-                       const void *src, unsigned src_stride,
-                       unsigned srcx, unsigned srcy,
-                       unsigned width, unsigned height);
-
-   void (*region_copy)(struct pipe_context *pipe,
-                       struct pipe_region *dest,
-                       unsigned dest_offset,
-                       unsigned destx, unsigned desty,
-                       struct pipe_region *src,        /* don't make this const - 
-                                                  need to map/unmap */
-                       unsigned src_offset,
-                       unsigned srcx, unsigned srcy,
-                       unsigned width, unsigned height);
-
-   void (*region_fill)(struct pipe_context *pipe,
-                       struct pipe_region *dst,
-                       unsigned dst_offset,
-                       unsigned dstx, unsigned dsty,
-                       unsigned width, unsigned height,
-                       unsigned value);
+   void (*surface_data)(struct pipe_context *pipe,
+                       struct pipe_surface *dest,
+                       unsigned destx, unsigned desty,
+                       const void *src, unsigned src_stride,
+                       unsigned srcx, unsigned srcy,
+                       unsigned width, unsigned height);
+
+   void (*surface_copy)(struct pipe_context *pipe,
+                       struct pipe_surface *dest,
+                       unsigned destx, unsigned desty,
+                       struct pipe_surface *src, /* don't make this const - 
+                                                    need to map/unmap */
+                       unsigned srcx, unsigned srcy,
+                       unsigned width, unsigned height);
+
+   void (*surface_fill)(struct pipe_context *pipe,
+                       struct pipe_surface *dst,
+                       unsigned dstx, unsigned dsty,
+                       unsigned width, unsigned height,
+                       unsigned value);
 
 
    /*
     * Texture functions
     */
-   boolean (*mipmap_tree_layout)( struct pipe_context *pipe,
-                                 struct pipe_mipmap_tree *mt );
+   void (*texture_create)(struct pipe_context *pipe,
+                         struct pipe_texture **pt);
+
+   void (*texture_release)(struct pipe_context *pipe,
+                          struct pipe_texture **pt);
 
 
    /* Flush rendering: