Squashed commit of the following:

[mesa.git] / src / gallium / winsys / g3dvl / nouveau / nouveau_screen_vl.c

diff --git a/src/gallium/winsys/g3dvl/nouveau/nouveau_screen_vl.c b/src/gallium/winsys/g3dvl/nouveau/nouveau_screen_vl.c
deleted file mode 100644 (file)
index b7c74f8..0000000
--- a/src/gallium/winsys/g3dvl/nouveau/nouveau_screen_vl.c
+++ /dev/null
@@ -1,88 +0,0 @@
-#include "nouveau_screen_vl.h"
-#include <util/u_memory.h>
-#include <nouveau_drm.h>
-#include <common/nouveau_dri.h>
-#include <common/nouveau_local.h>
-
-#if NOUVEAU_DRM_HEADER_PATCHLEVEL != 12
-#error nouveau_drm.h version does not match expected version
-#endif
-
-/*
-PUBLIC const char __driConfigOptions[] =
-DRI_CONF_BEGIN
-DRI_CONF_END;
-static const GLuint __driNConfigOptions = 0;
-*/
-
-int nouveau_check_dri_drm_ddx(dri_version_t *dri, dri_version_t *drm, dri_version_t *ddx)
-{
-       static const dri_version_t ddx_expected = {0, 0, NOUVEAU_DRM_HEADER_PATCHLEVEL};
-       static const dri_version_t dri_expected = {4, 0, 0};
-       static const dri_version_t drm_expected = {0, 0, NOUVEAU_DRM_HEADER_PATCHLEVEL};
-
-       assert(dri);
-       assert(drm);
-       assert(ddx);
-
-       if (dri->major != dri_expected.major || dri->minor < dri_expected.minor)
-       {
-               NOUVEAU_ERR("Unexpected DRI version.\n");
-               return 1;
-       }
-       if (drm->major != drm_expected.major || drm->minor < drm_expected.minor)
-       {
-               NOUVEAU_ERR("Unexpected DRM version.\n");
-               return 1;
-       }
-       if (ddx->major != ddx_expected.major || ddx->minor < ddx_expected.minor)
-       {
-               NOUVEAU_ERR("Unexpected DDX version.\n");
-               return 1;
-       }
-
-       return 0;
-}
-
-int
-nouveau_screen_create(dri_screen_t *dri_screen, dri_framebuffer_t *dri_framebuf)
-{
-       struct nouveau_dri              *nv_dri = dri_framebuf->private;
-       struct nouveau_screen_vl        *nv_screen;
-
-       assert(dri_screen);
-       assert(dri_framebuf);
-
-       if (nouveau_check_dri_drm_ddx(&dri_screen->dri, &dri_screen->drm, &dri_screen->ddx))
-               return 1;
-
-       nv_screen = CALLOC_STRUCT(nouveau_screen_vl);
-
-       if (!nv_screen)
-               return 1;
-
-       if (nouveau_screen_init(nv_dri, dri_screen->fd, &nv_screen->base))
-       {
-               FREE(nv_screen);
-               return 1;
-       }
-
-       /*
-       driParseOptionInfo(&nv_screen->option_cache,
-                          __driConfigOptions, __driNConfigOptions);
-       */
-
-       nv_screen->dri_screen = dri_screen;
-       dri_screen->private = (void*)nv_screen;
-
-       return 0;
-}
-
-void
-nouveau_screen_destroy(dri_screen_t *dri_screen)
-{
-       struct nouveau_screen_vl *nv_screen = dri_screen->private;
-
-       nouveau_screen_cleanup(&nv_screen->base);
-       FREE(nv_screen);
-}