summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2015-06-18 17:53:42 -0600
committerBrian Paul <[email protected]>2015-06-19 08:45:00 -0600
commitc40f44cc991d9499243063cba95fbdc947c53371 (patch)
treef23ad70a1b2918286a1ba160bb934a3790008d4b
parent4c11008eba9f58621bbbae430f8717176045b0ce (diff)
gallium: whitespace, formatting clean-up in p_state.h
Remove trailing whitespace, move some braces, 78-column wrapping. Trivial.
-rw-r--r--src/gallium/include/pipe/p_state.h36
1 files changed, 20 insertions, 16 deletions
diff --git a/src/gallium/include/pipe/p_state.h b/src/gallium/include/pipe/p_state.h
index e01c62c09a4..a18f12e8a87 100644
--- a/src/gallium/include/pipe/p_state.h
+++ b/src/gallium/include/pipe/p_state.h
@@ -1,8 +1,8 @@
/**************************************************************************
- *
+ *
* Copyright 2007 VMware, Inc.
* All Rights Reserved.
- *
+ *
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
@@ -10,11 +10,11 @@
* distribute, sub license, and/or sell copies of the Software, and to
* permit persons to whom the Software is furnished to do so, subject to
* the following conditions:
- *
+ *
* The above copyright notice and this permission notice (including the
* next paragraph) shall be included in all copies or substantial portions
* of the Software.
- *
+ *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
@@ -22,13 +22,13 @@
* ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
+ *
**************************************************************************/
/**
* @file
- *
+ *
* Abstract graphics pipe state objects.
*
* Basic notes:
@@ -217,7 +217,7 @@ struct pipe_shader_state
};
-struct pipe_depth_state
+struct pipe_depth_state
{
unsigned enabled:1; /**< depth test enabled? */
unsigned writemask:1; /**< allow depth buffer writes? */
@@ -268,6 +268,7 @@ struct pipe_rt_blend_state
unsigned colormask:4; /**< bitmask of PIPE_MASK_R/G/B/A */
};
+
struct pipe_blend_state
{
unsigned independent_blend_enable:1;
@@ -285,11 +286,13 @@ struct pipe_blend_color
float color[4];
};
+
struct pipe_stencil_ref
{
ubyte ref_value[2];
};
+
struct pipe_framebuffer_state
{
unsigned width, height;
@@ -367,10 +370,10 @@ struct pipe_sampler_view
struct pipe_context *context; /**< context this view belongs to */
union {
struct {
- unsigned first_layer:16; /**< first layer to use for array textures */
- unsigned last_layer:16; /**< last layer to use for array textures */
- unsigned first_level:8; /**< first mipmap level to use */
- unsigned last_level:8; /**< last mipmap level to use */
+ unsigned first_layer:16; /**< first layer to use for array textures */
+ unsigned last_layer:16; /**< last layer to use for array textures */
+ unsigned first_level:8; /**< first mipmap level to use */
+ unsigned last_level:8; /**< last mipmap level to use */
} tex;
struct {
unsigned first_element;
@@ -455,7 +458,8 @@ struct pipe_vertex_buffer
* A constant buffer. A subrange of an existing buffer can be set
* as a constant buffer.
*/
-struct pipe_constant_buffer {
+struct pipe_constant_buffer
+{
struct pipe_resource *buffer; /**< the actual buffer */
unsigned buffer_offset; /**< offset to start of data in buffer, in bytes */
unsigned buffer_size; /**< how much data can be read in shader */
@@ -474,8 +478,8 @@ struct pipe_constant_buffer {
* and the CPU actually doesn't have to query it.
*
* Note that the buffer_size variable is actually specifying the available
- * space in the buffer, not the size of the attached buffer.
- * In other words in majority of cases buffer_size would simply be
+ * space in the buffer, not the size of the attached buffer.
+ * In other words in majority of cases buffer_size would simply be
* 'buffer->width0 - buffer_offset', so buffer_size refers to the size
* of the buffer left, after accounting for buffer offset, for stream output
* to write to.
@@ -511,7 +515,7 @@ struct pipe_vertex_element
* this attribute live in?
*/
unsigned vertex_buffer_index;
-
+
enum pipe_format src_format;
};
@@ -642,5 +646,5 @@ struct pipe_compute_state
#ifdef __cplusplus
}
#endif
-
+
#endif