Merge branch 'gallium-msaa'

[mesa.git] / src / gallium / include / pipe / p_state.h

diff --git a/src/gallium/include/pipe/p_state.h b/src/gallium/include/pipe/p_state.h
index d281d69ff2754fc486b28cc674e8f04bf0c66e5f..5255b2003f8d5b0d823af80bcffb31467058b65d 100644 (file)
--- a/src/gallium/include/pipe/p_state.h
+++ b/src/gallium/include/pipe/p_state.h
@@ -79,12 +79,13 @@ struct pipe_rasterizer_state
 {
    unsigned flatshade:1;
    unsigned light_twoside:1;
-   unsigned front_winding:2;  /**< PIPE_WINDING_x */
-   unsigned cull_mode:2;      /**< PIPE_WINDING_x */
-   unsigned fill_cw:2;        /**< PIPE_POLYGON_MODE_x */
-   unsigned fill_ccw:2;       /**< PIPE_POLYGON_MODE_x */
-   unsigned offset_cw:1;
-   unsigned offset_ccw:1;
+   unsigned front_ccw:1;
+   unsigned cull_face:2;      /**< PIPE_FACE_x */
+   unsigned fill_front:2;     /**< PIPE_POLYGON_MODE_x */
+   unsigned fill_back:2;      /**< PIPE_POLYGON_MODE_x */
+   unsigned offset_point:1;
+   unsigned offset_line:1;
+   unsigned offset_tri:1;
    unsigned scissor:1;
    unsigned poly_smooth:1;
    unsigned poly_stipple_enable:1;
@@ -218,6 +219,8 @@ struct pipe_blend_state
    unsigned logicop_enable:1;
    unsigned logicop_func:4;      /**< PIPE_LOGICOP_x */
    unsigned dither:1;
+   unsigned alpha_to_coverage:1;
+   unsigned alpha_to_one:1;
    struct pipe_rt_blend_state rt[PIPE_MAX_COLOR_BUFS];
 };
 
@@ -288,9 +291,6 @@ struct pipe_surface
 };
 
 
-
-
-
 /**
  * A view into a texture that can be bound to a shader stage.
  */
@@ -309,6 +309,9 @@ struct pipe_sampler_view
 };
 
 
+/**
+ * Subregion of 1D/2D/3D image resource.
+ */
 struct pipe_box
 {
    unsigned x;
@@ -320,7 +323,9 @@ struct pipe_box
 };
 
 
-
+/**
+ * A memory object/resource such as a vertex buffer or texture.
+ */
 struct pipe_resource
 {
    struct pipe_reference reference;
@@ -334,13 +339,16 @@ struct pipe_resource
 
    unsigned last_level:8;    /**< Index of last mipmap level present/defined */
    unsigned nr_samples:8;    /**< for multisampled surfaces, nr of samples */
-   unsigned _usage:8;         /* PIPE_USAGE_x (not a bitmask) */
+   unsigned usage:8;         /**< PIPE_USAGE_x (not a bitmask) */
 
-   unsigned bind;             /* PIPE_BIND_x */
-   unsigned flags;            /* PIPE_RESOURCE_FLAG_x */
+   unsigned bind;           /**< bitmask of PIPE_BIND_x */
+   unsigned flags;          /**< bitmask of PIPE_RESOURCE_FLAG_x */
 };
 
 
+/**
+ * Extra indexing info for (cube) texture resources.
+ */
 struct pipe_subresource
 {
    unsigned face:16;
@@ -349,7 +357,7 @@ struct pipe_subresource
 
 
 /**
- * Transfer object.  For data transfer to/from a texture.
+ * Transfer object.  For data transfer to/from a resource.
  */
 struct pipe_transfer
 {