summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian <brian.paul@tungstengraphics.com>2008-02-21 08:37:49 -0700
committerBrian <brian.paul@tungstengraphics.com>2008-02-21 12:33:30 -0700
commitd4d2e36a429fd015316c484fc40be7e6d2c69946 (patch)
treeb7352d1dc29b6a5c1a238bd89ab25e2d55d6714c
parent20fbcbf5801c28865c0bfab3cda45302c8474a66 (diff)
gallium: comments, white-space clean-up
-rw-r--r--src/gallium/include/pipe/p_state.h53
1 files changed, 30 insertions, 23 deletions
diff --git a/src/gallium/include/pipe/p_state.h b/src/gallium/include/pipe/p_state.h
index 1082343e2f..47fa78c31d 100644
--- a/src/gallium/include/pipe/p_state.h
+++ b/src/gallium/include/pipe/p_state.h
@@ -66,7 +66,8 @@ struct pipe_winsys;
* The driver will certainly subclass this to include actual memory
* management information.
*/
-struct pipe_buffer {
+struct pipe_buffer
+{
unsigned alignment;
unsigned usage;
unsigned size;
@@ -76,8 +77,6 @@ struct pipe_buffer {
};
-
-
/**
* Primitive (point/line/tri) rasterization info
*/
@@ -113,18 +112,21 @@ struct pipe_rasterizer_state
};
-struct pipe_poly_stipple {
+struct pipe_poly_stipple
+{
unsigned stipple[32];
};
-struct pipe_viewport_state {
+struct pipe_viewport_state
+{
float scale[4];
float translate[4];
};
-struct pipe_scissor_state {
+struct pipe_scissor_state
+{
unsigned minx:16;
unsigned miny:16;
unsigned maxx:16;
@@ -132,7 +134,8 @@ struct pipe_scissor_state {
};
-struct pipe_clip_state {
+struct pipe_clip_state
+{
float ucp[PIPE_MAX_CLIP_PLANES][4];
unsigned nr;
};
@@ -141,13 +144,15 @@ struct pipe_clip_state {
/**
* Constants for vertex/fragment shaders
*/
-struct pipe_constant_buffer {
+struct pipe_constant_buffer
+{
struct pipe_buffer *buffer;
unsigned size; /** in bytes */
};
-struct pipe_shader_state {
+struct pipe_shader_state
+{
const struct tgsi_token *tokens;
ubyte num_inputs;
ubyte num_outputs;
@@ -185,7 +190,8 @@ struct pipe_depth_stencil_alpha_state
};
-struct pipe_blend_state {
+struct pipe_blend_state
+{
unsigned blend_enable:1;
unsigned rgb_func:3; /**< PIPE_BLEND_x */
@@ -204,7 +210,8 @@ struct pipe_blend_state {
};
-struct pipe_blend_color {
+struct pipe_blend_color
+{
float color[4];
};
@@ -224,19 +231,19 @@ struct pipe_framebuffer_state
*/
struct pipe_sampler_state
{
- unsigned wrap_s:3; /**< PIPE_TEX_WRAP_x */
- unsigned wrap_t:3; /**< PIPE_TEX_WRAP_x */
- unsigned wrap_r:3; /**< PIPE_TEX_WRAP_x */
+ unsigned wrap_s:3; /**< PIPE_TEX_WRAP_x */
+ unsigned wrap_t:3; /**< PIPE_TEX_WRAP_x */
+ unsigned wrap_r:3; /**< PIPE_TEX_WRAP_x */
unsigned min_img_filter:2; /**< PIPE_TEX_FILTER_x */
unsigned min_mip_filter:2; /**< PIPE_TEX_MIPFILTER_x */
unsigned mag_img_filter:2; /**< PIPE_TEX_FILTER_x */
- unsigned compare:1; /**< shadow/depth compare enabled? */
- unsigned compare_mode:1; /**< PIPE_TEX_COMPARE_x */
- unsigned compare_func:3; /**< PIPE_FUNC_x */
- unsigned normalized_coords:1; /**< Are coords normalized to [0,1]? */
- float shadow_ambient; /**< shadow test fail color/intensity */
- float lod_bias; /**< LOD/lambda bias */
- float min_lod, max_lod; /**< LOD clamp range, after bias */
+ unsigned compare:1; /**< shadow/depth compare enabled? */
+ unsigned compare_mode:1; /**< PIPE_TEX_COMPARE_x */
+ unsigned compare_func:3; /**< PIPE_FUNC_x */
+ unsigned normalized_coords:1; /**< Are coords normalized to [0,1]? */
+ float shadow_ambient; /**< shadow test fail color/intensity */
+ float lod_bias; /**< LOD/lambda bias */
+ float min_lod, max_lod; /**< LOD clamp range, after bias */
float border_color[4];
float max_anisotropy;
};
@@ -248,10 +255,10 @@ struct pipe_sampler_state
*/
struct pipe_surface
{
- struct pipe_buffer *buffer; /**< driver private buffer handle */
+ struct pipe_buffer *buffer; /**< surface's buffer/memory */
enum pipe_format format; /**< PIPE_FORMAT_x */
unsigned status; /**< PIPE_SURFACE_STATUS_x */
- unsigned clear_value; /**< may be temporary */
+ unsigned clear_value; /**< XXX may be temporary */
unsigned cpp; /**< bytes per pixel */
unsigned width;
unsigned height;