i965/vec4: Remove swizzle_for_size() in favour of brw_swizzle_for_size().

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

diff --git a/src/mesa/drivers/dri/nouveau/nouveau_screen.c b/src/mesa/drivers/dri/nouveau/nouveau_screen.c
index 766ae6f2f79e76767dc2d98fdd7a8e7d78eb876e..153f18e4a34845a1274da0f01a176542e8d18c1e 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/nouveau_screen.c
+++ b/src/mesa/drivers/dri/nouveau/nouveau_screen.c
@@ -24,6 +24,7 @@
  *
  */
 
+#include <stdio.h>
 #include <xf86drm.h>
 #include <nouveau_drm.h>
 #include "nouveau_driver.h"
@@ -64,16 +65,16 @@ nouveau_get_configs(void)
                GLX_NONE, GLX_SWAP_UNDEFINED_OML
        };
 
-       for (i = 0; i < Elements(formats); i++) {
+       for (i = 0; i < ARRAY_SIZE(formats); i++) {
                __DRIconfig **config;
 
                config = driCreateConfigs(formats[i],
                                          depth_bits, stencil_bits,
-                                         Elements(depth_bits),
+                                         ARRAY_SIZE(depth_bits),
                                          back_buffer_modes,
-                                         Elements(back_buffer_modes),
+                                         ARRAY_SIZE(back_buffer_modes),
                                          msaa_samples,
-                                         Elements(msaa_samples),
+                                         ARRAY_SIZE(msaa_samples),
                                          GL_TRUE);
                assert(config);
 
@@ -95,6 +96,8 @@ nouveau_init_screen2(__DRIscreen *dri_screen)
        if (!screen)
                return NULL;
 
+       dri_screen->driverPrivate = screen;
+
        /* Open the DRM device. */
        ret = nouveau_device_wrap(dri_screen->fd, 0, &screen->device);
        if (ret) {
@@ -119,10 +122,11 @@ nouveau_init_screen2(__DRIscreen *dri_screen)
                dri_screen->max_gl_es1_version = 10;
                break;
        default:
-               assert(0);
+               nouveau_error("Unknown chipset: %02X\n",
+                             screen->device->chipset);
+               goto fail;
        }
 
-       dri_screen->driverPrivate = screen;
        dri_screen->extensions = nouveau_screen_extensions;
        screen->dri_screen = dri_screen;