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

[mesa.git] / src / mesa / drivers / dri / nouveau / nv04_context.h

diff --git a/src/mesa/drivers/dri/nouveau/nv04_context.h b/src/mesa/drivers/dri/nouveau/nv04_context.h
index 45e70d2bc3caf009ad9a8b5f47c1096b6515229e..b63024c14287e2c7b3d5baa16fddf768a8994b61 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/nv04_context.h
+++ b/src/mesa/drivers/dri/nouveau/nv04_context.h
@@ -28,18 +28,30 @@
 #define __NV04_CONTEXT_H__
 
 #include "nouveau_context.h"
+#include "nv_object.xml.h"
 
 struct nv04_context {
        struct nouveau_context base;
-       struct nouveau_grobj *eng3d;
+       struct nouveau_object *eng3d;
        struct nouveau_surface dummy_texture;
        float viewport[16];
+
+       uint32_t colorkey;
+       struct nouveau_surface *texture[2];
+       uint32_t format[2];
+       uint32_t filter[2];
+       uint32_t alpha[2];
+       uint32_t color[2];
+       uint32_t factor;
+       uint32_t blend;
+       uint32_t ctrl[3];
+       uint32_t fog;
 };
 #define to_nv04_context(ctx) ((struct nv04_context *)(ctx))
 
-#define nv04_mtex_engine(obj) ((obj)->grclass == NV04_MULTITEX_TRIANGLE)
+#define nv04_mtex_engine(obj) ((obj)->oclass == NV04_MULTITEX_TRIANGLE_CLASS)
 
-struct nouveau_grobj *
+struct nouveau_object *
 nv04_context_engine(struct gl_context *ctx);
 
 extern const struct nouveau_driver nv04_driver;