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

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

diff --git a/src/mesa/drivers/dri/nouveau/nouveau_driver.h b/src/mesa/drivers/dri/nouveau/nouveau_driver.h
index 283f6eac2c8fbf5bf2d923eeeb5415d6c419241e..a4273a554bd229b31ee5c7cd2cb92c8cc0682f7f 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/nouveau_driver.h
+++ b/src/mesa/drivers/dri/nouveau/nouveau_driver.h
@@ -31,36 +31,33 @@
 #include "main/mtypes.h"
 #include "main/macros.h"
 #include "main/formats.h"
+#include "main/state.h"
 #include "utils.h"
 #include "dri_util.h"
 
 #undef NDEBUG
 #include <assert.h>
 
-#include "nouveau_device.h"
-#include "nouveau_pushbuf.h"
-#include "nouveau_grobj.h"
-#include "nouveau_channel.h"
-#include "nouveau_bo.h"
-#include "nouveau_notifier.h"
+#include <nouveau.h>
 #include "nouveau_screen.h"
 #include "nouveau_state.h"
 #include "nouveau_surface.h"
+#include "nouveau_local.h"
 
-#define DRIVER_DATE    "20091015"
 #define DRIVER_AUTHOR  "Nouveau"
 
 struct nouveau_driver {
-       GLcontext *(*context_create)(struct nouveau_screen *screen,
-                                    const GLvisual *visual,
-                                    GLcontext *share_ctx);
-       void (*context_destroy)(GLcontext *ctx);
+       struct gl_context *(*context_create)(struct nouveau_screen *screen,
+                                    gl_api api,
+                                    const struct gl_config *visual,
+                                    struct gl_context *share_ctx);
+       void (*context_destroy)(struct gl_context *ctx);
 
-       void (*surface_copy)(GLcontext *ctx,
+       void (*surface_copy)(struct gl_context *ctx,
                             struct nouveau_surface *dst,
                             struct nouveau_surface *src,
                             int dx, int dy, int sx, int sy, int w, int h);
-       void (*surface_fill)(GLcontext *ctx,
+       void (*surface_fill)(struct gl_context *ctx,
                             struct nouveau_surface *dst,
                             unsigned mask, unsigned value,
                             int dx, int dy, int w, int h);
@@ -72,11 +69,16 @@ struct nouveau_driver {
 #define nouveau_error(format, ...) \
        fprintf(stderr, "%s: " format, __func__, ## __VA_ARGS__)
 
+extern const char const *nouveau_vendor_string;
+
+const char *
+nouveau_get_renderer_string(unsigned chipset);
+
 void
-nouveau_clear(GLcontext *ctx, GLbitfield buffers);
+nouveau_clear(struct gl_context *ctx, GLbitfield buffers);
 
 void
-nouveau_span_functions_init(GLcontext *ctx);
+nouveau_span_functions_init(struct gl_context *ctx);
 
 void
 nouveau_driver_functions_init(struct dd_function_table *functions);