summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBrian <brian.paul@tungstengraphics.com>2008-01-11 16:31:58 -0700
committerBrian <brian.paul@tungstengraphics.com>2008-01-11 16:31:58 -0700
commit50eb29ed9492a34db4ba53f1f28a2868b808955a (patch)
tree7007fb69189b29acaa57f453dd8a88b23566e9fd /src
parent8dd678208e4dcd90e07dc271d11d73d87465e0fd (diff)
whitespace, comment changes
Diffstat (limited to 'src')
-rw-r--r--src/mesa/pipe/p_state.h30
1 files changed, 14 insertions, 16 deletions
diff --git a/src/mesa/pipe/p_state.h b/src/mesa/pipe/p_state.h
index 76e633e930..f9c5bfb6c6 100644
--- a/src/mesa/pipe/p_state.h
+++ b/src/mesa/pipe/p_state.h
@@ -56,18 +56,13 @@
#define PIPE_MAX_SHADER_OUTPUTS 16
-/* fwd decl */
+/* fwd decls */
struct pipe_surface;
+struct pipe_winsys;
/* opaque type */
struct pipe_buffer_handle;
-struct pipe_winsys;
-
-
-/***
- *** State objects
- ***/
/**
@@ -115,6 +110,7 @@ struct pipe_viewport_state {
float translate[4];
};
+
struct pipe_scissor_state {
unsigned minx:16;
unsigned miny:16;
@@ -122,6 +118,7 @@ struct pipe_scissor_state {
unsigned maxy:16;
};
+
struct pipe_clip_state {
float ucp[PIPE_MAX_CLIP_PLANES][4];
unsigned nr;
@@ -148,13 +145,14 @@ struct pipe_shader_state {
ubyte output_semantic_index[PIPE_MAX_SHADER_OUTPUTS];
};
+
struct pipe_depth_stencil_alpha_state
{
struct {
- unsigned enabled:1; /**< depth test enabled? */
- unsigned writemask:1; /**< allow depth buffer writes? */
- unsigned func:3; /**< depth test func (PIPE_FUNC_x) */
- unsigned occlusion_count:1; /**< XXX move this elsewhere? */
+ unsigned enabled:1; /**< depth test enabled? */
+ unsigned writemask:1; /**< allow depth buffer writes? */
+ unsigned func:3; /**< depth test func (PIPE_FUNC_x) */
+ unsigned occlusion_count:1; /**< do occlusion counting? */
} depth;
struct {
unsigned enabled:1;
@@ -165,12 +163,11 @@ struct pipe_depth_stencil_alpha_state
ubyte ref_value;
ubyte value_mask;
ubyte write_mask;
- } stencil[2]; /**< [0] = front, [1] = back */
-
+ } stencil[2]; /**< [0] = front, [1] = back */
struct {
unsigned enabled:1;
- unsigned func:3; /**< PIPE_FUNC_x */
- float ref; /**< reference value */
+ unsigned func:3; /**< PIPE_FUNC_x */
+ float ref; /**< reference value */
} alpha;
};
@@ -193,10 +190,12 @@ struct pipe_blend_state {
unsigned dither:1;
};
+
struct pipe_blend_color {
float color[4];
};
+
struct pipe_framebuffer_state
{
/** multiple colorbuffers for multiple render targets */
@@ -314,5 +313,4 @@ struct pipe_vertex_element
};
-
#endif