diff options
| -rw-r--r-- | src/gallium/Makefile.am | 2 | ||||
| -rw-r--r-- | src/gallium/state_trackers/gbm/Makefile.am | 48 | ||||
| -rw-r--r-- | src/gallium/state_trackers/gbm/Makefile.sources | 3 | ||||
| -rw-r--r-- | src/gallium/state_trackers/gbm/gbm_drm.c | 308 | ||||
| -rw-r--r-- | src/gallium/state_trackers/gbm/gbm_gallium_drmint.h | 67 | ||||
| -rw-r--r-- | src/gallium/targets/gbm/Makefile.am | 95 | ||||
| -rwxr-xr-x | src/gallium/targets/gbm/gallium-gbm-symbols-check | 13 | ||||
| -rw-r--r-- | src/gallium/targets/gbm/gbm.sym | 6 | ||||
| -rw-r--r-- | src/gallium/targets/gbm/target.c | 1 |
9 files changed, 0 insertions, 543 deletions
diff --git a/src/gallium/Makefile.am b/src/gallium/Makefile.am index 652cb1310b..69e2e1ed48 100644 --- a/src/gallium/Makefile.am +++ b/src/gallium/Makefile.am @@ -114,8 +114,6 @@ EXTRA_DIST = \ docs \ README.portability \ SConscript \ - state_trackers/gbm \ - targets/gbm \ winsys/sw/gdi \ winsys/sw/hgl diff --git a/src/gallium/state_trackers/gbm/Makefile.am b/src/gallium/state_trackers/gbm/Makefile.am deleted file mode 100644 index 50995b3530..0000000000 --- a/src/gallium/state_trackers/gbm/Makefile.am +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright © 2012 Intel Corporation -# -# 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 (including the next -# paragraph) 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 Makefile.sources -include $(top_srcdir)/src/gallium/Automake.inc - -AM_CFLAGS = \ - $(GALLIUM_CFLAGS) \ - $(X11_INCLUDES) \ - $(VISIBILITY_CFLAGS) - -AM_CPPFLAGS = \ - -I$(top_srcdir)/src/gbm/main \ - $(GALLIUM_PIPE_LOADER_DEFINES) \ - -DPIPE_SEARCH_DIR=\"$(libdir)/gallium-pipe\" - -if HAVE_GALLIUM_STATIC_TARGETS -AM_CPPFLAGS += \ - -DGALLIUM_STATIC_TARGETS=1 -endif - -if HAVE_EGL_PLATFORM_WAYLAND -AM_CFLAGS += $(WAYLAND_CFLAGS) -AM_CPPFLAGS += -DHAVE_WAYLAND_PLATFORM -endif - -noinst_LTLIBRARIES = libgbm.la - -libgbm_la_SOURCES = $(C_SOURCES) diff --git a/src/gallium/state_trackers/gbm/Makefile.sources b/src/gallium/state_trackers/gbm/Makefile.sources deleted file mode 100644 index 1ab961c551..0000000000 --- a/src/gallium/state_trackers/gbm/Makefile.sources +++ /dev/null @@ -1,3 +0,0 @@ -C_SOURCES := \ - gbm_drm.c \ - gbm_gallium_drmint.h diff --git a/src/gallium/state_trackers/gbm/gbm_drm.c b/src/gallium/state_trackers/gbm/gbm_drm.c deleted file mode 100644 index da6d7241ae..0000000000 --- a/src/gallium/state_trackers/gbm/gbm_drm.c +++ /dev/null @@ -1,308 +0,0 @@ -/* - * Copyright © 2011 Intel Corporation - * - * 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 (including the next - * paragraph) 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. - * - * Authors: - * Benjamin Franzke <benjaminfranzke@googlemail.com> - */ - -#include "util/u_memory.h" -#include "util/u_inlines.h" - -#include "pipe-loader/pipe_loader.h" -#include "state_tracker/drm_driver.h" - -#include <unistd.h> -#include <sys/types.h> - -#include "gbm_gallium_drmint.h" - -/* For importing wl_buffer */ -#if HAVE_WAYLAND_PLATFORM -#include "../../../egl/wayland/wayland-drm/wayland-drm.h" -#endif - -static INLINE enum pipe_format -gbm_format_to_gallium(enum gbm_bo_format format) -{ - switch (format) { - case GBM_BO_FORMAT_XRGB8888: - return PIPE_FORMAT_BGRX8888_UNORM; - case GBM_BO_FORMAT_ARGB8888: - return PIPE_FORMAT_BGRA8888_UNORM; - default: - return PIPE_FORMAT_NONE; - } - - return PIPE_FORMAT_NONE; -} - -static INLINE uint -gbm_usage_to_gallium(uint usage) -{ - uint resource_usage = 0; - - if (usage & GBM_BO_USE_SCANOUT) - resource_usage |= PIPE_BIND_SCANOUT; - - if (usage & GBM_BO_USE_RENDERING) - resource_usage |= PIPE_BIND_RENDER_TARGET | PIPE_BIND_SAMPLER_VIEW; - - if (usage & GBM_BO_USE_CURSOR) - resource_usage |= PIPE_BIND_CURSOR; - - return resource_usage; -} - -static int -gbm_gallium_drm_is_format_supported(struct gbm_device *gbm, - enum gbm_bo_format format, - uint32_t usage) -{ - struct gbm_gallium_drm_device *gdrm = gbm_gallium_drm_device(gbm); - enum pipe_format pf; - - pf = gbm_format_to_gallium(format); - if (pf == PIPE_FORMAT_NONE) - return 0; - - if (!gdrm->screen->is_format_supported(gdrm->screen, pf, PIPE_TEXTURE_2D, 0, - gbm_usage_to_gallium(usage))) - return 0; - - if (usage & GBM_BO_USE_SCANOUT && format != GBM_BO_FORMAT_XRGB8888) - return 0; - - return 1; -} - -static void -gbm_gallium_drm_bo_destroy(struct gbm_bo *_bo) -{ - struct gbm_gallium_drm_bo *bo = gbm_gallium_drm_bo(_bo); - - pipe_resource_reference(&bo->resource, NULL); - free(bo); -} - -static struct gbm_bo * -gbm_gallium_drm_bo_import(struct gbm_device *gbm, - uint32_t type, void *buffer, uint32_t usage) -{ - struct gbm_gallium_drm_device *gdrm = gbm_gallium_drm_device(gbm); - struct gbm_gallium_drm_bo *bo; - struct winsys_handle whandle; - struct pipe_resource *resource; - - switch (type) { -#if HAVE_WAYLAND_PLATFORM - case GBM_BO_IMPORT_WL_BUFFER: - { - struct wl_drm_buffer *wb = (struct wl_drm_buffer *) buffer; - - resource = wb->driver_buffer; - break; - } -#endif - - case GBM_BO_IMPORT_EGL_IMAGE: - if (!gdrm->lookup_egl_image) - return NULL; - - resource = gdrm->lookup_egl_image(gdrm->lookup_egl_image_data, buffer); - if (resource == NULL) - return NULL; - break; - - default: - return NULL; - } - - bo = CALLOC_STRUCT(gbm_gallium_drm_bo); - if (bo == NULL) - return NULL; - - bo->base.base.gbm = gbm; - bo->base.base.width = resource->width0; - bo->base.base.height = resource->height0; - - switch (resource->format) { - case PIPE_FORMAT_BGRX8888_UNORM: - bo->base.base.format = GBM_BO_FORMAT_XRGB8888; - break; - case PIPE_FORMAT_BGRA8888_UNORM: - bo->base.base.format = GBM_BO_FORMAT_ARGB8888; - break; - default: - FREE(bo); - return NULL; - } - - pipe_resource_reference(&bo->resource, resource); - - memset(&whandle, 0, sizeof(whandle)); - whandle.type = DRM_API_HANDLE_TYPE_KMS; - gdrm->screen->resource_get_handle(gdrm->screen, bo->resource, &whandle); - - bo->base.base.handle.u32 = whandle.handle; - bo->base.base.stride = whandle.stride; - - return &bo->base.base; -} - -static struct gbm_bo * -gbm_gallium_drm_bo_create(struct gbm_device *gbm, - uint32_t width, uint32_t height, - enum gbm_bo_format format, uint32_t usage) -{ - struct gbm_gallium_drm_device *gdrm = gbm_gallium_drm_device(gbm); - struct gbm_gallium_drm_bo *bo; - struct pipe_resource templ; - struct winsys_handle whandle; - enum pipe_format pf; - - bo = CALLOC_STRUCT(gbm_gallium_drm_bo); - if (bo == NULL) - return NULL; - - bo->base.base.gbm = gbm; - bo->base.base.width = width; - bo->base.base.height = height; - bo->base.base.format = format; - - pf = gbm_format_to_gallium(format); - if (pf == PIPE_FORMAT_NONE) - return NULL; - - memset(&templ, 0, sizeof(templ)); - templ.bind = gbm_usage_to_gallium(usage); - templ.format = pf; - templ.target = PIPE_TEXTURE_2D; - templ.last_level = 0; - templ.width0 = width; - templ.height0 = height; - templ.depth0 = 1; - templ.array_size = 1; - - bo->resource = gdrm->screen->resource_create(gdrm->screen, &templ); - if (bo->resource == NULL) { - FREE(bo); - return NULL; - } - - memset(&whandle, 0, sizeof(whandle)); - whandle.type = DRM_API_HANDLE_TYPE_KMS; - gdrm->screen->resource_get_handle(gdrm->screen, bo->resource, &whandle); - - bo->base.base.handle.u32 = whandle.handle; - bo->base.base.stride = whandle.stride; - - return &bo->base.base; -} - -static void -gbm_gallium_drm_destroy(struct gbm_device *gbm) -{ - struct gbm_gallium_drm_device *gdrm = gbm_gallium_drm_device(gbm); - - free(gdrm->base.driver_name); - gdrm->screen->destroy(gdrm->screen); -#if !GALLIUM_STATIC_TARGETS - pipe_loader_release(&gdrm->dev, 1); -#endif - free(gdrm); -} - -#if !GALLIUM_STATIC_TARGETS -#ifdef HAVE_PIPE_LOADER_DRM -static const char * -get_library_search_path(void) -{ - const char *search_path = NULL; - - /* don't allow setuid apps to use GBM_BACKENDS_PATH */ - if (geteuid() == getuid()) - search_path = getenv("GBM_BACKENDS_PATH"); - if (search_path == NULL) - search_path = PIPE_SEARCH_DIR; - - return search_path; -} -#endif -#endif - -static struct gbm_device * -gbm_gallium_drm_device_create(int fd) -{ - struct gbm_gallium_drm_device *gdrm; - - gdrm = calloc(1, sizeof *gdrm); - if (!gdrm) - return NULL; - - gdrm->base.base.fd = fd; - gdrm->base.base.bo_create = gbm_gallium_drm_bo_create; - gdrm->base.base.bo_import = gbm_gallium_drm_bo_import; - gdrm->base.base.bo_destroy = gbm_gallium_drm_bo_destroy; - gdrm->base.base.is_format_supported = gbm_gallium_drm_is_format_supported; - gdrm->base.base.destroy = gbm_gallium_drm_destroy; - - gdrm->base.type = GBM_DRM_DRIVER_TYPE_GALLIUM; - gdrm->base.base.name = "drm"; - -#if GALLIUM_STATIC_TARGETS - gdrm->screen = dd_create_screen(gdrm->base.base.fd); -#else -#ifdef HAVE_PIPE_LOADER_DRM - if (pipe_loader_drm_probe_fd(&gdrm->dev, gdrm->base.base.fd, false)) - gdrm->screen = pipe_loader_create_screen(gdrm->dev, - get_library_search_path()); -#endif /* HAVE_PIPE_LOADER_DRM */ -#endif - - if (gdrm->screen == NULL) - goto out_no_screen; - -#if GALLIUM_STATIC_TARGETS - gdrm->base.driver_name = strdup(dd_driver_name()); -#else -#ifdef HAVE_PIPE_LOADER_DRM - gdrm->base.driver_name = strdup(gdrm->dev->driver_name); -#endif /* HAVE_PIPE_LOADER_DRM */ -#endif - return &gdrm->base.base; - -out_no_screen: - debug_printf("failed to load gallium_gbm\n"); -#if !GALLIUM_STATIC_TARGETS - if (gdrm->dev) - pipe_loader_release(&gdrm->dev, 1); -#endif - free(gdrm); - return NULL; -} - - -GBM_EXPORT struct gbm_backend gbm_backend = { - .backend_name = "gallium_drm", - .create_device = gbm_gallium_drm_device_create, -}; diff --git a/src/gallium/state_trackers/gbm/gbm_gallium_drmint.h b/src/gallium/state_trackers/gbm/gbm_gallium_drmint.h deleted file mode 100644 index 8b05ef99d4..0000000000 --- a/src/gallium/state_trackers/gbm/gbm_gallium_drmint.h +++ /dev/null @@ -1,67 +0,0 @@ -/* - * Copyright © 2011 Intel Corporation - * - * 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 (including the next - * paragraph) 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. - * - * Authors: - * Benjamin Franzke <benjaminfranzke@googlemail.com> - */ - -#ifndef _GBM_GALLIUM_DRMINT_H_ -#define _GBM_GALLIUM_DRMINT_H_ - -#include "pipe/p_state.h" - -#include "gbmint.h" - -#include "common_drm.h" - -struct gbm_gallium_drm_device { - struct gbm_drm_device base; - - struct pipe_screen *screen; - struct pipe_loader_device *dev; - - struct pipe_resource *(*lookup_egl_image)(void *data, - void *egl_image); - void *lookup_egl_image_data; - -}; - -struct gbm_gallium_drm_bo { - struct gbm_drm_bo base; - - struct pipe_resource *resource; -}; - -static inline struct gbm_gallium_drm_device * -gbm_gallium_drm_device(struct gbm_device *gbm) -{ - return (struct gbm_gallium_drm_device *) gbm; -} - -static inline struct gbm_gallium_drm_bo * -gbm_gallium_drm_bo(struct gbm_bo *bo) -{ - return (struct gbm_gallium_drm_bo *) bo; -} - -#endif diff --git a/src/gallium/targets/gbm/Makefile.am b/src/gallium/targets/gbm/Makefile.am deleted file mode 100644 index aaf7580764..0000000000 --- a/src/gallium/targets/gbm/Makefile.am +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright © 2012 Intel Corporation -# -# 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 (including the next -# paragraph) 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 $(top_srcdir)/src/gallium/Automake.inc - -AM_CFLAGS = \ - $(GALLIUM_TARGET_CFLAGS) - -gbmdir = $(libdir)/gbm -gbm_LTLIBRARIES = gbm_gallium_drm.la - -nodist_EXTRA_gbm_gallium_drm_la_SOURCES = dummy.cpp -gbm_gallium_drm_la_SOURCES = - -gbm_gallium_drm_la_LIBADD = \ - $(top_builddir)/src/gallium/state_trackers/gbm/libgbm.la \ - $(top_builddir)/src/gallium/auxiliary/libgalliumvl_stub.la \ - $(top_builddir)/src/gallium/auxiliary/libgallium.la \ - $(top_builddir)/src/util/libmesautil.la \ - $(LIBDRM_LIBS) \ - $(GALLIUM_COMMON_LIB_DEPS) - -gbm_gallium_drm_la_LDFLAGS = \ - -module \ - -no-undefined \ - -avoid-version \ - $(GC_SECTIONS) \ - $(LD_NO_UNDEFINED) - -if HAVE_LD_VERSION_SCRIPT -gbm_gallium_drm_la_LDFLAGS += \ - -Wl,--version-script=$(top_srcdir)/src/gallium/targets/gbm/gbm.sym -endif - -EXTRA_gbm_gallium_drm_la_DEPENDENCIES = gbm.sym -EXTRA_DIST = gallium-gbm-symbols-check gbm.sym - -if HAVE_GALLIUM_STATIC_TARGETS - -TARGET_DRIVERS = -TARGET_CPPFLAGS = -TARGET_LIB_DEPS = $(top_builddir)/src/loader/libloader.la - -include $(top_srcdir)/src/gallium/drivers/i915/Automake.inc - -include $(top_srcdir)/src/gallium/drivers/ilo/Automake.inc - -include $(top_srcdir)/src/gallium/drivers/nouveau/Automake.inc - -include $(top_srcdir)/src/gallium/drivers/r300/Automake.inc -include $(top_srcdir)/src/gallium/drivers/r600/Automake.inc -include $(top_srcdir)/src/gallium/drivers/radeonsi/Automake.inc - -include $(top_srcdir)/src/gallium/drivers/svga/Automake.inc - -include $(top_srcdir)/src/gallium/drivers/freedreno/Automake.inc - -gbm_gallium_drm_la_SOURCES += target.c -gbm_gallium_drm_la_CPPFLAGS = $(TARGET_CPPFLAGS) -gbm_gallium_drm_la_LIBADD += $(TARGET_LIB_DEPS) \ - $(TARGET_RADEON_WINSYS) $(TARGET_RADEON_COMMON) - -else # HAVE_GALLIUM_STATIC_TARGETS -gbm_gallium_drm_la_LIBADD += \ - $(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader.la \ - $(GALLIUM_PIPE_LOADER_WINSYS_LIBS) \ - $(GALLIUM_PIPE_LOADER_LIBS) - -endif # HAVE_GALLIUM_STATIC_TARGETS - -if HAVE_MESA_LLVM -gbm_gallium_drm_la_LIBADD += $(LLVM_LIBS) -gbm_gallium_drm_la_LDFLAGS += $(LLVM_LDFLAGS) -endif - -TESTS = gallium-gbm-symbols-check diff --git a/src/gallium/targets/gbm/gallium-gbm-symbols-check b/src/gallium/targets/gbm/gallium-gbm-symbols-check deleted file mode 100755 index 52b20ab858..0000000000 --- a/src/gallium/targets/gbm/gallium-gbm-symbols-check +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash - -FUNCS=$(nm -D --defined-only ${1-.libs/gbm_gallium_drm.so} | egrep -o "T .*|D .*" | cut -c 3- | while read func; do -( grep -q "^$func$" || echo $func ) <<EOF -gbm_backend -_edata -_fini -_init -EOF -done) - -test ! -n "$FUNCS" || echo $FUNCS -test ! -n "$FUNCS" diff --git a/src/gallium/targets/gbm/gbm.sym b/src/gallium/targets/gbm/gbm.sym deleted file mode 100644 index d5fa0b9a8d..0000000000 --- a/src/gallium/targets/gbm/gbm.sym +++ /dev/null @@ -1,6 +0,0 @@ -{ - global: - gbm_backend; - local: - *; -}; diff --git a/src/gallium/targets/gbm/target.c b/src/gallium/targets/gbm/target.c deleted file mode 100644 index fde4a4a7dc..0000000000 --- a/src/gallium/targets/gbm/target.c +++ /dev/null @@ -1 +0,0 @@ -#include "target-helpers/inline_drm_helper.h" |