diff options
| author | Eric Anholt <anholt@FreeBSD.org> | 2006-07-19 12:31:36 -0400 |
|---|---|---|
| committer | Eric Anholt <anholt@FreeBSD.org> | 2006-07-19 12:31:36 -0400 |
| commit | 76a316d0cec92a04c8735926a76e76c21f960d7e (patch) | |
| tree | 75bcc64b3af49c4d7bff3ac28605d7567d76da8c /src/i915_reg.h | |
| parent | 433cb6ba82698676f6f72e09834aba4d64611d54 (diff) | |
| parent | 84805167ab8a422966355b9753bfcb4dad802413 (diff) | |
Merge branch 'master' into exa
Conflicts:
src/Makefile.am
Diffstat (limited to 'src/i915_reg.h')
| -rw-r--r-- | src/i915_reg.h | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/src/i915_reg.h b/src/i915_reg.h index e2d7b9d9..b9f7ef8e 100644 --- a/src/i915_reg.h +++ b/src/i915_reg.h @@ -236,6 +236,22 @@ #define IAB_DST_FACTOR_SHIFT 0 #define IAB_DST_FACTOR_MASK (BLENDFACT_MASK<<0) +#define BLENDFACT_ZERO 0x01 +#define BLENDFACT_ONE 0x02 +#define BLENDFACT_SRC_COLR 0x03 +#define BLENDFACT_INV_SRC_COLR 0x04 +#define BLENDFACT_SRC_ALPHA 0x05 +#define BLENDFACT_INV_SRC_ALPHA 0x06 +#define BLENDFACT_DST_ALPHA 0x07 +#define BLENDFACT_INV_DST_ALPHA 0x08 +#define BLENDFACT_DST_COLR 0x09 +#define BLENDFACT_INV_DST_COLR 0x0a +#define BLENDFACT_SRC_ALPHA_SATURATE 0x0b +#define BLENDFACT_CONST_COLOR 0x0c +#define BLENDFACT_INV_CONST_COLOR 0x0d +#define BLENDFACT_CONST_ALPHA 0x0e +#define BLENDFACT_INV_CONST_ALPHA 0x0f +#define BLENDFACT_MASK 0x0f #define BLENDFUNC_ADD 0x0 #define BLENDFUNC_SUBTRACT 0x1 @@ -433,6 +449,7 @@ #define ENABLE_LOGIC_OP_FUNC (1<<23) #define LOGIC_OP_FUNC(x) ((x)<<18) #define LOGICOP_MASK (0xf<<18) +#define LOGICOP_COPY 0xc #define MODE4_ENABLE_STENCIL_TEST_MASK ((1<<17)|(0xff00)) #define ENABLE_STENCIL_TEST_MASK (1<<17) #define STENCIL_TEST_MASK(x) ((x)<<8) |