summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/mesa/drivers/dri/r300/r300_cmdbuf.c2
-rw-r--r--src/mesa/drivers/dri/r300/r300_reg.h16
2 files changed, 12 insertions, 6 deletions
diff --git a/src/mesa/drivers/dri/r300/r300_cmdbuf.c b/src/mesa/drivers/dri/r300/r300_cmdbuf.c
index 243a65a267..02d64103dc 100644
--- a/src/mesa/drivers/dri/r300/r300_cmdbuf.c
+++ b/src/mesa/drivers/dri/r300/r300_cmdbuf.c
@@ -400,7 +400,7 @@ void r300InitCmdBuf(r300ContextPtr r300)
ALLOC_STATE(fogs, always, R300_FOGS_CMDSIZE, 0);
r300->hw.fogs.cmd[R300_FOGS_CMD_0] = cmdpacket0(FG_FOG_BLEND, 1);
ALLOC_STATE(fogc, always, R300_FOGC_CMDSIZE, 0);
- r300->hw.fogc.cmd[R300_FOGC_CMD_0] = cmdpacket0(R300_FOG_COLOR_R, 3);
+ r300->hw.fogc.cmd[R300_FOGC_CMD_0] = cmdpacket0(FG_FOG_COLOR_R, 3);
ALLOC_STATE(at, always, R300_AT_CMDSIZE, 0);
r300->hw.at.cmd[R300_AT_CMD_0] = cmdpacket0(FG_ALPHA_FUNC, 2);
ALLOC_STATE(fg_depth_src, always, 2, 0);
diff --git a/src/mesa/drivers/dri/r300/r300_reg.h b/src/mesa/drivers/dri/r300/r300_reg.h
index 17d051da4a..3425fc387f 100644
--- a/src/mesa/drivers/dri/r300/r300_reg.h
+++ b/src/mesa/drivers/dri/r300/r300_reg.h
@@ -1469,11 +1469,17 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
# define FG_FOG_BLEND_FN_CONSTANT (3 << 1)
# define FG_FOG_BLEND_FN_MASK 0x00000006
-#define R300_FOG_COLOR_R 0x4BC8
-#define R300_FOG_COLOR_G 0x4BCC
-#define R300_FOG_COLOR_B 0x4BD0
-/* Constant Factor for Fog Blending */
-#define R300_FG_FOG_FACTOR 0x4bc4
+/* Fog: Red Component of Fog Color */
+#define FG_FOG_COLOR_R 0x4bc8
+/* Fog: Green Component of Fog Color */
+#define FG_FOG_COLOR_G 0x4bcc
+/* Fog: Blue Component of Fog Color */
+#define FG_FOG_COLOR_B 0x4db0
+# define FG_FOG_COLOR_MASK 0x000001ff
+
+/* Fog: Constant Factor for Fog Blending */
+#define FG_FOG_FACTOR 0x4bc4
+# define FG_FOG_FACTOR_MASK 0x000001ff
/* Fog: Alpha function */
#define FG_ALPHA_FUNC 0x4bd4