From 6b63e25b3d7a6ac0bd738c139ead0c7e7ad84368 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Sat, 14 Jan 2012 08:46:05 -0500 Subject: gallium: Prefix #defines in tgsi_exec.h with TGSI_ --- src/gallium/auxiliary/tgsi/tgsi_exec.h | 36 +++++++++++++++++----------------- 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'src/gallium/auxiliary/tgsi/tgsi_exec.h') diff --git a/src/gallium/auxiliary/tgsi/tgsi_exec.h b/src/gallium/auxiliary/tgsi/tgsi_exec.h index 63c7087..613b383 100644 --- a/src/gallium/auxiliary/tgsi/tgsi_exec.h +++ b/src/gallium/auxiliary/tgsi/tgsi_exec.h @@ -42,8 +42,8 @@ extern "C" { #define TGSI_CHAN_Z 2 #define TGSI_CHAN_W 3 -#define NUM_CHANNELS 4 /* R,G,B,A */ -#define QUAD_SIZE 4 /* 4 pixel/quad */ +#define TGSI_NUM_CHANNELS 4 /* R,G,B,A */ +#define TGSI_QUAD_SIZE 4 /* 4 pixel/quad */ /** @@ -51,9 +51,9 @@ extern "C" { */ union tgsi_exec_channel { - float f[QUAD_SIZE]; - int i[QUAD_SIZE]; - unsigned u[QUAD_SIZE]; + float f[TGSI_QUAD_SIZE]; + int i[TGSI_QUAD_SIZE]; + unsigned u[TGSI_QUAD_SIZE]; }; /** @@ -61,7 +61,7 @@ union tgsi_exec_channel */ struct tgsi_exec_vector { - union tgsi_exec_channel xyzw[NUM_CHANNELS]; + union tgsi_exec_channel xyzw[TGSI_NUM_CHANNELS]; }; /** @@ -70,9 +70,9 @@ struct tgsi_exec_vector */ struct tgsi_interp_coef { - float a0[NUM_CHANNELS]; /* in an xyzw layout */ - float dadx[NUM_CHANNELS]; - float dady[NUM_CHANNELS]; + float a0[TGSI_NUM_CHANNELS]; /* in an xyzw layout */ + float dadx[TGSI_NUM_CHANNELS]; + float dady[TGSI_NUM_CHANNELS]; }; enum tgsi_sampler_control { @@ -88,18 +88,18 @@ struct tgsi_sampler { /** Get samples for four fragments in a quad */ void (*get_samples)(struct tgsi_sampler *sampler, - const float s[QUAD_SIZE], - const float t[QUAD_SIZE], - const float p[QUAD_SIZE], - const float c0[QUAD_SIZE], + const float s[TGSI_QUAD_SIZE], + const float t[TGSI_QUAD_SIZE], + const float p[TGSI_QUAD_SIZE], + const float c0[TGSI_QUAD_SIZE], enum tgsi_sampler_control control, - float rgba[NUM_CHANNELS][QUAD_SIZE]); + float rgba[TGSI_NUM_CHANNELS][TGSI_QUAD_SIZE]); void (*get_dims)(struct tgsi_sampler *sampler, int level, int dims[4]); - void (*get_texel)(struct tgsi_sampler *sampler, const int i[QUAD_SIZE], - const int j[QUAD_SIZE], const int k[QUAD_SIZE], - const int lod[QUAD_SIZE], const int8_t offset[3], - float rgba[NUM_CHANNELS][QUAD_SIZE]); + void (*get_texel)(struct tgsi_sampler *sampler, const int i[TGSI_QUAD_SIZE], + const int j[TGSI_QUAD_SIZE], const int k[TGSI_QUAD_SIZE], + const int lod[TGSI_QUAD_SIZE], const int8_t offset[3], + float rgba[TGSI_NUM_CHANNELS][TGSI_QUAD_SIZE]); }; #define TGSI_EXEC_NUM_TEMPS 128 -- cgit v1.1