i965/nir: Do not scalarize phis in non-scalar setups

[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 0018eec021f72a907dba4f6dd330c69fe2f84f2b..a4273a554bd229b31ee5c7cd2cb92c8cc0682f7f 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/nouveau_driver.h
+++ b/src/mesa/drivers/dri/nouveau/nouveau_driver.h
@@ -38,20 +38,17 @@
 #undef NDEBUG
 #include <assert.h>
 
-#include "nouveau_device.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 "nv04_pushbuf.h"
+#include "nouveau_local.h"
 
 #define DRIVER_AUTHOR  "Nouveau"
 
 struct nouveau_driver {
        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);
@@ -72,6 +69,11 @@ 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(struct gl_context *ctx, GLbitfield buffers);