Module Name: src
Committed By: macallan
Date: Fri Dec 16 23:31:16 UTC 2016
Modified Files:
src/sys/dev/pci: pm2reg.h
Log Message:
flesh out alpha operations properly
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/pci/pm2reg.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/pm2reg.h
diff -u src/sys/dev/pci/pm2reg.h:1.11 src/sys/dev/pci/pm2reg.h:1.12
--- src/sys/dev/pci/pm2reg.h:1.11 Fri Dec 16 01:42:04 2016
+++ src/sys/dev/pci/pm2reg.h Fri Dec 16 23:31:16 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: pm2reg.h,v 1.11 2016/12/16 01:42:04 macallan Exp $ */
+/* $NetBSD: pm2reg.h,v 1.12 2016/12/16 23:31:16 macallan Exp $ */
/*
* Copyright (c) 2009 Michael Lorenz
@@ -348,10 +348,23 @@
#define PM2_RE_ALPHA_MODE 0x00008810
#define PM2AL_ENABLE 0x00000001
#define PM2AL_OPERATION_MASK 0x000000fe
-/* values according to manual, xf86-video-glint disagrees */
-#define PM2AL_OP_FORMAT 16 /* needs to be shifted? */
-#define PM2AL_OP_BLEND 84
-#define PM2AL_OP_PREMULT 81
+#define PM2AL_OP_SRC_IS_ZERO 0x00000000
+#define PM2AL_OP_SRC_IS_ONE 0x00000002
+#define PM2AL_OP_SRC_IS_DST_COLOR 0x00000004
+#define PM2AL_OP_SRC_IS_ONE_MINUS_DST_COLOR 0x00000006
+#define PM2AL_OP_SRC_IS_SRC_ALPHA 0x00000008
+#define PM2AL_OP_SRC_IS_ONE_MINUS_SRC_ALPHA 0x0000000a
+#define PM2AL_OP_SRC_IS_DST_ALPHA 0x0000000c
+#define PM2AL_OP_SRC_IS_ONE_MINUS_DST_ALPHA 0x0000000e
+#define PM2AL_OP_SRC_IS_SRC_ALPHA_SATURATE 0x00000010
+#define PM2AL_OP_DST_IS_ZERO 0x00000000
+#define PM2AL_OP_DST_IS_ONE 0x00000020
+#define PM2AL_OP_DST_IS_SRC_COLOR 0x00000040
+#define PM2AL_OP_DST_IS_ONE_MINUS_SRC_COLOR 0x00000060
+#define PM2AL_OP_DST_IS_SRC_ALPHA 0x00000080
+#define PM2AL_OP_DST_IS_ONE_MINUS_SRC_ALPHA 0x000000a0
+#define PM2AL_OP_DST_IS_DST_ALPHA 0x000000c0
+#define PM2AL_OP_DST_IS_ONE_MINUS_DST_ALPHA 0x000000e0
/*
* XXX
* format of incoming data