Mesa (master): nv10, nv20: Fix build.

Francisco Jerez currojerez at kemper.freedesktop.org
Mon Feb 1 00:46:53 UTC 2010


Module: Mesa
Branch: master
Commit: 71b32cc838ea682e60ea7a4a0e0ae17edce89c9a
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=71b32cc838ea682e60ea7a4a0e0ae17edce89c9a

Author: Francisco Jerez <currojerez at riseup.net>
Date:   Sun Jan 31 17:18:09 2010 +0100

nv10, nv20: Fix build.

---

 src/gallium/drivers/nv10/nv10_context.c |    2 +-
 src/gallium/drivers/nv20/nv20_context.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/nv10/nv10_context.c b/src/gallium/drivers/nv10/nv10_context.c
index 1ecb73d..900a640 100644
--- a/src/gallium/drivers/nv10/nv10_context.c
+++ b/src/gallium/drivers/nv10/nv10_context.c
@@ -146,7 +146,7 @@ static void nv10_init_hwctx(struct nv10_context *nv10)
 	OUT_RING  (chan, 0);
 	BEGIN_RING(chan, celsius, NV10TCL_LIGHT_MODEL, 1);
 	OUT_RING  (chan, 0);
-	BEGIN_RING(chan, celsius, NV10TCL_COLOR_CONTROL, 1);
+	BEGIN_RING(chan, celsius, NV10TCL_SEPARATE_SPECULAR_ENABLE, 1);
 	OUT_RING  (chan, 0);
 	BEGIN_RING(chan, celsius, NV10TCL_ENABLED_LIGHTS, 1);
 	OUT_RING  (chan, 0);
diff --git a/src/gallium/drivers/nv20/nv20_context.c b/src/gallium/drivers/nv20/nv20_context.c
index 5b80af2..22185a2 100644
--- a/src/gallium/drivers/nv20/nv20_context.c
+++ b/src/gallium/drivers/nv20/nv20_context.c
@@ -245,7 +245,7 @@ static void nv20_init_hwctx(struct nv20_context *nv20)
 	}
 	BEGIN_RING(chan, kelvin, NV20TCL_LIGHTING_ENABLE, 1);
 	OUT_RING  (chan, 0);
-	BEGIN_RING(chan, kelvin, NV20TCL_LIGHT_CONTROL, 1);
+	BEGIN_RING(chan, kelvin, NV20TCL_LIGHT_MODEL, 1);
 	OUT_RING  (chan, 0x00020000);
 	BEGIN_RING(chan, kelvin, NV20TCL_SEPARATE_SPECULAR_ENABLE, 1);
 	OUT_RING  (chan, 0);




More information about the mesa-commit mailing list