i965/vec4: Return the emitted instruction in emit_lrp()

[mesa.git] / src / mesa / drivers / dri / nouveau / nv10_state_tnl.c

diff --git a/src/mesa/drivers/dri/nouveau/nv10_state_tnl.c b/src/mesa/drivers/dri/nouveau/nv10_state_tnl.c
index 06155fe011cbda03ff830d9c82c8844bd29b41bb..1398385b262611e9453a4dfaf886cbc24f47ca42 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/nv10_state_tnl.c
+++ b/src/mesa/drivers/dri/nouveau/nv10_state_tnl.c
@@ -31,6 +31,8 @@
 #include "nv10_3d.xml.h"
 #include "nv10_driver.h"
 
+#include "util/simple_list.h"
+
 void
 nv10_emit_clip_plane(struct gl_context *ctx, int emit)
 {
@@ -144,7 +146,7 @@ nv10_emit_fog(struct gl_context *ctx, int emit)
        PUSH_DATA (push, get_fog_mode(f->Mode));
        PUSH_DATA (push, get_fog_source(source, f->FogDistanceMode));
        PUSH_DATAb(push, f->Enabled);
-       PUSH_DATA (push, pack_rgba_f(MESA_FORMAT_RGBA8888_REV, f->Color));
+       PUSH_DATA (push, pack_rgba_f(MESA_FORMAT_R8G8B8A8_UNORM, f->Color));
 
        BEGIN_NV04(push, NV10_3D(FOG_COEFF(0)), 3);
        PUSH_DATAp(push, k, 3);