summaryrefslogtreecommitdiff
path: root/src/mesa/pipe
diff options
context:
space:
mode:
authorBrian <brian.paul@tungstengraphics.com>2007-10-27 09:43:28 -0600
committerBrian <brian.paul@tungstengraphics.com>2007-10-27 09:43:28 -0600
commit79d8e78442c08082083261d517cdf260e0bd309f (patch)
tree9b464544f5e288acbf6011e930cd7f988ce10212 /src/mesa/pipe
parentd75ff8447cd0b993be36f399ccd360aaf412b1f3 (diff)
New comments, replace //-style with /* */
Diffstat (limited to 'src/mesa/pipe')
-rw-r--r--src/mesa/pipe/tgsi/exec/tgsi_exec.c6
-rw-r--r--src/mesa/pipe/tgsi/exec/tgsi_exec.h53
2 files changed, 51 insertions, 8 deletions
diff --git a/src/mesa/pipe/tgsi/exec/tgsi_exec.c b/src/mesa/pipe/tgsi/exec/tgsi_exec.c
index df4abc6066..e4f23d3eef 100644
--- a/src/mesa/pipe/tgsi/exec/tgsi_exec.c
+++ b/src/mesa/pipe/tgsi/exec/tgsi_exec.c
@@ -1,6 +1,6 @@
/**************************************************************************
*
- * Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas.
+ * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.
* All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
@@ -1212,7 +1212,7 @@ exec_tex(struct tgsi_exec_machine *mach,
uint chan_index;
float lodBias;
- // printf("Sampler %u unit %u\n", sampler, unit);
+ /* printf("Sampler %u unit %u\n", sampler, unit); */
switch (inst->InstructionExtTexture.Texture) {
case TGSI_TEXTURE_1D:
@@ -1364,7 +1364,7 @@ perspective_interpolation(
for( i = 0; i < QUAD_SIZE; i++ ) {
const float x = mach->Inputs[0].xyzw[0].f[i];
const float y = mach->Inputs[0].xyzw[1].f[i];
- // WPOS.w here is really 1/w
+ /* WPOS.w here is really 1/w */
const float w = 1.0f / mach->Inputs[0].xyzw[3].f[i];
assert(mach->Inputs[0].xyzw[3].f[i] != 0.0);
diff --git a/src/mesa/pipe/tgsi/exec/tgsi_exec.h b/src/mesa/pipe/tgsi/exec/tgsi_exec.h
index 38f9218520..1d497e97fb 100644
--- a/src/mesa/pipe/tgsi/exec/tgsi_exec.h
+++ b/src/mesa/pipe/tgsi/exec/tgsi_exec.h
@@ -1,3 +1,30 @@
+/**************************************************************************
+ *
+ * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.
+ * 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
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * 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.
+ * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * 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.
+ *
+ **************************************************************************/
+
#if !defined TGSI_EXEC_H
#define TGSI_EXEC_H
@@ -5,11 +32,14 @@
#if defined __cplusplus
extern "C" {
-#endif // defined __cplusplus
+#endif
#define NUM_CHANNELS 4 /* R,G,B,A */
#define QUAD_SIZE 4 /* 4 pixel/quad */
+/**
+ * Registers may be treated as float, signed int or unsigned int.
+ */
union tgsi_exec_channel
{
float f[QUAD_SIZE];
@@ -17,11 +47,18 @@ union tgsi_exec_channel
unsigned u[QUAD_SIZE];
};
+/**
+ * A vector[RGBA] of channels[4 pixels]
+ */
struct tgsi_exec_vector
{
union tgsi_exec_channel xyzw[NUM_CHANNELS];
};
+/**
+ * For fragment programs, information for computing fragment input
+ * values from plane equation of the triangle/line.
+ */
struct tgsi_interp_coef
{
float a0[NUM_CHANNELS]; /* in an xyzw layout */
@@ -32,6 +69,10 @@ struct tgsi_interp_coef
struct softpipe_tile_cache; /**< Opaque to TGSI */
+/**
+ * Information for sampling textures, which must be implemented
+ * by code outside the TGSI executor.
+ */
struct tgsi_sampler
{
const struct pipe_sampler_state *state;
@@ -47,6 +88,9 @@ struct tgsi_sampler
struct softpipe_tile_cache *cache;
};
+/**
+ * For branching/calling subroutines.
+ */
struct tgsi_exec_labels
{
unsigned labels[128][2];
@@ -184,8 +228,7 @@ tgsi_exec_machine_run(
struct tgsi_exec_machine *mach );
#if defined __cplusplus
-} // extern "C"
-#endif // defined __cplusplus
-
-#endif // !defined TGSI_EXEC_H
+} /* extern "C" */
+#endif
+#endif /* TGSI_EXEC_H */