summaryrefslogtreecommitdiff
path: root/src/gallium/winsys/drm/sw
diff options
context:
space:
mode:
Diffstat (limited to 'src/gallium/winsys/drm/sw')
-rw-r--r--src/gallium/winsys/drm/sw/Makefile14
-rw-r--r--src/gallium/winsys/drm/sw/sw_drm_api.c97
-rw-r--r--src/gallium/winsys/drm/sw/sw_drm_api.h34
-rw-r--r--src/gallium/winsys/drm/sw/wrapper_sw_winsys.c282
-rw-r--r--src/gallium/winsys/drm/sw/wrapper_sw_winsys.h35
5 files changed, 0 insertions, 462 deletions
diff --git a/src/gallium/winsys/drm/sw/Makefile b/src/gallium/winsys/drm/sw/Makefile
deleted file mode 100644
index 5f3c3ec325..0000000000
--- a/src/gallium/winsys/drm/sw/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-TOP = ../../../../..
-include $(TOP)/configs/current
-
-LIBNAME = swdrm
-
-C_SOURCES = \
- wrapper_sw_winsys.c \
- sw_drm_api.c
-
-LIBRARY_INCLUDES =
-
-LIBRARY_DEFINES =
-
-include ../../../Makefile.template
diff --git a/src/gallium/winsys/drm/sw/sw_drm_api.c b/src/gallium/winsys/drm/sw/sw_drm_api.c
deleted file mode 100644
index 0fd2163913..0000000000
--- a/src/gallium/winsys/drm/sw/sw_drm_api.c
+++ /dev/null
@@ -1,97 +0,0 @@
-/**********************************************************
- * Copyright 2010 VMware, Inc. All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use, copy,
- * modify, merge, publish, distribute, sublicense, and/or sell copies
- * of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- **********************************************************/
-
-
-#include "util/u_memory.h"
-#include "softpipe/sp_public.h"
-#include "state_tracker/drm_api.h"
-#include "wrapper_sw_winsys.h"
-#include "sw_drm_api.h"
-
-
-/*
- * Defines
- */
-
-
-struct sw_drm_api
-{
- struct drm_api base;
- struct drm_api *api;
- struct sw_winsys *sw;
-};
-
-static INLINE struct sw_drm_api *
-sw_drm_api(struct drm_api *api)
-{
- return (struct sw_drm_api *)api;
-}
-
-
-/*
- * Exported functions
- */
-
-
-static struct pipe_screen *
-sw_drm_create_screen(struct drm_api *_api, int drmFD,
- struct drm_create_screen_arg *arg)
-{
- struct sw_drm_api *swapi = sw_drm_api(_api);
- struct drm_api *api = swapi->api;
- struct sw_winsys *sww;
- struct pipe_screen *screen;
-
- screen = api->create_screen(api, drmFD, arg);
-
- sww = wrapper_sw_winsys_warp_pipe_screen(screen);
-
- return softpipe_create_screen(sww);
-}
-
-static void
-sw_drm_destroy(struct drm_api *api)
-{
- struct sw_drm_api *swapi = sw_drm_api(api);
- if (swapi->api->destroy)
- swapi->api->destroy(swapi->api);
-
- FREE(swapi);
-}
-
-struct drm_api *
-sw_drm_api_create(struct drm_api *api)
-{
- struct sw_drm_api *swapi = CALLOC_STRUCT(sw_drm_api);
-
- swapi->base.name = "sw";
- swapi->base.driver_name = api->driver_name;
- swapi->base.create_screen = sw_drm_create_screen;
- swapi->base.destroy = sw_drm_destroy;
-
- swapi->api = api;
-
- return &swapi->base;
-}
diff --git a/src/gallium/winsys/drm/sw/sw_drm_api.h b/src/gallium/winsys/drm/sw/sw_drm_api.h
deleted file mode 100644
index ce90a04ae0..0000000000
--- a/src/gallium/winsys/drm/sw/sw_drm_api.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/**********************************************************
- * Copyright 2010 VMware, Inc. All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use, copy,
- * modify, merge, publish, distribute, sublicense, and/or sell copies
- * of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- **********************************************************/
-
-
-#ifndef SW_DRM_API_H
-#define SW_DRM_API_H
-
-struct drm_api;
-
-struct drm_api * sw_drm_api_create(struct drm_api *api);
-
-#endif
diff --git a/src/gallium/winsys/drm/sw/wrapper_sw_winsys.c b/src/gallium/winsys/drm/sw/wrapper_sw_winsys.c
deleted file mode 100644
index 459b1c1e2a..0000000000
--- a/src/gallium/winsys/drm/sw/wrapper_sw_winsys.c
+++ /dev/null
@@ -1,282 +0,0 @@
-/**********************************************************
- * Copyright 2010 VMware, Inc. All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use, copy,
- * modify, merge, publish, distribute, sublicense, and/or sell copies
- * of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- **********************************************************/
-
-
-#include "wrapper_sw_winsys.h"
-
-#include "pipe/p_format.h"
-#include "pipe/p_state.h"
-
-#include "state_tracker/sw_winsys.h"
-
-#include "util/u_memory.h"
-#include "util/u_inlines.h"
-
-/*
- * This code wraps a pipe_screen and exposes a sw_winsys interface for use
- * with software resterizers. This code is used by the DRM based winsys to
- * allow access to the drm driver.
- *
- * We must borrow the whole stack because only the pipe screen knows how
- * to decode the content of a buffer. Or how to create a buffer that
- * can still be used by drivers using real hardware (as the case is
- * with software st/xorg but hw st/dri).
- *
- * We also need a pipe context for the transfers.
- */
-
-struct wrapper_sw_winsys
-{
- struct sw_winsys base;
- struct pipe_screen *screen;
- struct pipe_context *pipe;
-};
-
-struct wrapper_sw_displaytarget
-{
- struct wrapper_sw_winsys *winsys;
- struct pipe_texture *tex;
- struct pipe_transfer *transfer;
-
- unsigned width;
- unsigned height;
- unsigned map_count;
- unsigned stride; /**< because we give stride at create */
- void *ptr;
-};
-
-static INLINE struct wrapper_sw_winsys *
-wrapper_sw_winsys(struct sw_winsys *ws)
-{
- return (struct wrapper_sw_winsys *)ws;
-}
-
-static INLINE struct wrapper_sw_displaytarget *
-wrapper_sw_displaytarget(struct sw_displaytarget *dt)
-{
- return (struct wrapper_sw_displaytarget *)dt;
-}
-
-
-/*
- * Functions
- */
-
-
-static boolean
-wsw_dt_get_stride(struct wrapper_sw_displaytarget *wdt, unsigned *stride)
-{
- struct pipe_context *pipe = wdt->winsys->pipe;
- struct pipe_texture *tex = wdt->tex;
- struct pipe_transfer *tr;
-
- tr = pipe->get_tex_transfer(pipe, tex, 0, 0, 0,
- PIPE_TRANSFER_READ_WRITE,
- 0, 0, wdt->width, wdt->height);
- if (!tr)
- return FALSE;
-
- *stride = tr->stride;
- wdt->stride = tr->stride;
-
- pipe->tex_transfer_destroy(pipe, tr);
-
- return TRUE;
-}
-
-static struct sw_displaytarget *
-wsw_dt_wrap_texture(struct wrapper_sw_winsys *wsw,
- struct pipe_texture *tex, unsigned *stride)
-{
- struct wrapper_sw_displaytarget *wdt = CALLOC_STRUCT(wrapper_sw_displaytarget);
- if (!wdt)
- goto err_unref;
-
- wdt->tex = tex;
- wdt->winsys = wsw;
-
- if (!wsw_dt_get_stride(wdt, stride))
- goto err_free;
-
- return (struct sw_displaytarget *)wdt;
-
-err_free:
- FREE(wdt);
-err_unref:
- pipe_texture_reference(&tex, NULL);
- return NULL;
-}
-
-static struct sw_displaytarget *
-wsw_dt_create(struct sw_winsys *ws,
- unsigned tex_usage,
- enum pipe_format format,
- unsigned width, unsigned height,
- unsigned alignment,
- unsigned *stride)
-{
- struct wrapper_sw_winsys *wsw = wrapper_sw_winsys(ws);
- struct pipe_texture templ;
- struct pipe_texture *tex;
-
- /*
- * XXX Why don't we just get the template.
- */
- memset(&templ, 0, sizeof(templ));
- templ.width0 = width;
- templ.height0 = height;
- templ.format = format;
- templ.tex_usage = tex_usage;
-
- /* XXX alignment: we can't do anything about this */
-
- tex = wsw->screen->texture_create(wsw->screen, &templ);
- if (!tex)
- return NULL;
-
- return wsw_dt_wrap_texture(wsw, tex, stride);
-}
-
-static struct sw_displaytarget *
-wsw_dt_from_handle(struct sw_winsys *ws,
- const struct pipe_texture *templ,
- struct winsys_handle *whandle,
- unsigned *stride)
-{
- struct wrapper_sw_winsys *wsw = wrapper_sw_winsys(ws);
- struct pipe_texture *tex;
-
- tex = wsw->screen->texture_from_handle(wsw->screen, templ, whandle);
- if (!tex)
- return NULL;
-
- return wsw_dt_wrap_texture(wsw, tex, stride);
-}
-
-static void *
-wsw_dt_map(struct sw_winsys *ws,
- struct sw_displaytarget *dt,
- unsigned flags)
-{
- struct wrapper_sw_displaytarget *wdt = wrapper_sw_displaytarget(dt);
- struct pipe_context *pipe = wdt->winsys->pipe;
- struct pipe_texture *tex = wdt->tex;
- struct pipe_transfer *tr;
- void *ptr;
-
- if (!wdt->map_count) {
-
- assert(!wdt->transfer);
-
- tr = pipe->get_tex_transfer(pipe, tex, 0, 0, 0,
- PIPE_TRANSFER_READ_WRITE,
- 0, 0, wdt->width, wdt->height);
- if (!tr)
- return NULL;
-
- ptr = pipe->transfer_map(pipe, tr);
- if (!ptr)
- goto err;
-
- wdt->transfer = tr;
- wdt->ptr = ptr;
-
- /* XXX Handle this case */
- assert(tr->stride == wdt->stride);
- }
-
- wdt->map_count++;
-
- return wdt->ptr;
-
-err:
- pipe->tex_transfer_destroy(pipe, tr);
- return NULL;
-}
-
-static void
-wsw_dt_unmap(struct sw_winsys *ws,
- struct sw_displaytarget *dt)
-{
- struct wrapper_sw_displaytarget *wdt = wrapper_sw_displaytarget(dt);
- struct pipe_context *pipe = wdt->winsys->pipe;
-
- assert(wdt->transfer);
-
- wdt->map_count--;
-
- if (wdt->map_count)
- return;
-
- pipe->transfer_unmap(pipe, wdt->transfer);
- pipe->tex_transfer_destroy(pipe, wdt->transfer);
- wdt->transfer = NULL;
-}
-
-static void
-wsw_dt_destroy(struct sw_winsys *ws,
- struct sw_displaytarget *dt)
-{
- struct wrapper_sw_displaytarget *wdt = wrapper_sw_displaytarget(dt);
-
- pipe_texture_reference(&wdt->tex, NULL);
-
- FREE(wdt);
-}
-
-static void
-wsw_destroy(struct sw_winsys *ws)
-{
- struct wrapper_sw_winsys *wsw = wrapper_sw_winsys(ws);
-
- wsw->pipe->destroy(wsw->pipe);
- wsw->screen->destroy(wsw->screen);
-
- FREE(wsw);
-}
-
-struct sw_winsys *
-wrapper_sw_winsys_warp_pipe_screen(struct pipe_screen *screen)
-{
- struct wrapper_sw_winsys *wsw = CALLOC_STRUCT(wrapper_sw_winsys);
-
- wsw->base.displaytarget_create = wsw_dt_create;
- wsw->base.displaytarget_from_handle = wsw_dt_from_handle;
- wsw->base.displaytarget_map = wsw_dt_map;
- wsw->base.displaytarget_unmap = wsw_dt_unmap;
- wsw->base.displaytarget_destroy = wsw_dt_destroy;
- wsw->base.destroy = wsw_destroy;
-
- wsw->screen = screen;
- wsw->pipe = screen->context_create(screen, NULL);
- if (!wsw->pipe)
- goto err;
-
- return &wsw->base;
-
-err:
- FREE(wsw);
- return NULL;
-}
diff --git a/src/gallium/winsys/drm/sw/wrapper_sw_winsys.h b/src/gallium/winsys/drm/sw/wrapper_sw_winsys.h
deleted file mode 100644
index b5c25a3c50..0000000000
--- a/src/gallium/winsys/drm/sw/wrapper_sw_winsys.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/**********************************************************
- * Copyright 2010 VMware, Inc. All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use, copy,
- * modify, merge, publish, distribute, sublicense, and/or sell copies
- * of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- **********************************************************/
-
-
-#ifndef WRAPPER_SW_WINSYS
-#define WRAPPER_SW_WINSYS
-
-struct sw_winsys;
-struct pipe_screen;
-
-struct sw_winsys *wrapper_sw_winsys_warp_pipe_screen(struct pipe_screen *screen);
-
-#endif