targets/egl-static: use inline_drm_helper and Automake.inc helpers

Update all three build systems, and add freedreno to the android
build. Pending future work on the ST we can convert egl-static
to provide either static or dynamic access to the pipe-drivers.

There is no functional change with this patch.

v2: Don't add freedreno to android build, drop the wrapper winsys.

Cc: Chia-I Wu <[email protected]>
Signed-off-by: Emil Velikov <[email protected]>

1 files changed, 0 insertions, 210 deletions

diff --git a/src/gallium/targets/egl-static/egl_pipe.c b/src/gallium/targets/egl-static/egl_pipe.c
index 4f960a52ffe..c38e4bc3c7f 100644
--- a/src/gallium/targets/egl-static/egl_pipe.c
+++ b/src/gallium/targets/egl-static/egl_pipe.c
@@ -28,216 +28,6 @@
 #include "target-helpers/inline_sw_helper.h"
 #include "egl_pipe.h"
 
-/* for i915 */
-#if _EGL_PIPE_I915
-#include "i915/drm/i915_drm_public.h"
-#include "i915/i915_public.h"
-#include "target-helpers/inline_wrapper_sw_helper.h"
-#endif
-/* for ilo */
-#if _EGL_PIPE_ILO
-#include "intel/intel_winsys.h"
-#include "ilo/ilo_public.h"
-#endif
-/* for nouveau */
-#if _EGL_PIPE_NOUVEAU
-#include "nouveau/drm/nouveau_drm_public.h"
-#endif
-/* for r300 */
-#if _EGL_PIPE_R300
-#include "radeon/drm/radeon_winsys.h"
-#include "radeon/drm/radeon_drm_public.h"
-#include "r300/r300_public.h"
-#endif
-/* for r600 */
-#if _EGL_PIPE_R600
-#include "radeon/drm/radeon_winsys.h"
-#include "radeon/drm/radeon_drm_public.h"
-#include "r600/r600_public.h"
-#endif
-/* for radeonsi */
-#if _EGL_PIPE_RADEONSI
-#include "radeon/drm/radeon_winsys.h"
-#include "radeon/drm/radeon_drm_public.h"
-#include "radeonsi/si_public.h"
-#endif
-/* for vmwgfx */
-#if _EGL_PIPE_VMWGFX
-#include "svga/drm/svga_drm_public.h"
-#include "svga/svga_public.h"
-#endif
-/* for freedreno */
-#if _EGL_PIPE_FREEDRENO
-#include "freedreno/drm/freedreno_drm_public.h"
-#endif
-
-static struct pipe_screen *
-pipe_i915_create_screen(int fd)
-{
-#if _EGL_PIPE_I915
-   struct i915_winsys *iws;
-   struct pipe_screen *screen;
-
-   iws = i915_drm_winsys_create(fd);
-   if (!iws)
-      return NULL;
-
-   screen = i915_screen_create(iws);
-   if (!screen)
-      return NULL;
-
-   screen = debug_screen_wrap(screen);
-
-   return screen;
-#else
-   return NULL;
-#endif
-}
-
-static struct pipe_screen *
-pipe_ilo_create_screen(int fd)
-{
-#if _EGL_PIPE_ILO
-   struct intel_winsys *iws;
-   struct pipe_screen *screen;
-
-   iws = intel_winsys_create_for_fd(fd);
-   if (!iws)
-      return NULL;
-
-   screen = ilo_screen_create(iws);
-   if (!screen)
-      return NULL;
-
-   screen = debug_screen_wrap(screen);
-
-   return screen;
-#else
-   return NULL;
-#endif
-}
-
-static struct pipe_screen *
-pipe_nouveau_create_screen(int fd)
-{
-#if _EGL_PIPE_NOUVEAU
-   struct pipe_screen *screen;
-
-   screen = nouveau_drm_screen_create(fd);
-   if (!screen)
-      return NULL;
-
-   screen = debug_screen_wrap(screen);
-
-   return screen;
-#else
-   return NULL;
-#endif
-}
-
-static struct pipe_screen *
-pipe_r300_create_screen(int fd)
-{
-#if _EGL_PIPE_R300
-   struct radeon_winsys *sws;
-
-   sws = radeon_drm_winsys_create(fd, r300_screen_create);
-   return sws ? debug_screen_wrap(sws->screen) : NULL;
-#else
-   return NULL;
-#endif
-}
-
-static struct pipe_screen *
-pipe_r600_create_screen(int fd)
-{
-#if _EGL_PIPE_R600
-   struct radeon_winsys *rw;
-
-   rw = radeon_drm_winsys_create(fd, r600_screen_create);
-   return rw ? debug_screen_wrap(rw->screen) : NULL;
-#else
-   return NULL;
-#endif
-}
-
-static struct pipe_screen *
-pipe_radeonsi_create_screen(int fd)
-{
-#if _EGL_PIPE_RADEONSI
-   struct radeon_winsys *rw;
-
-   rw = radeon_drm_winsys_create(fd, radeonsi_screen_create);
-   return rw ? debug_screen_wrap(rw->screen) : NULL;
-#else
-   return NULL;
-#endif
-}
-
-static struct pipe_screen *
-pipe_vmwgfx_create_screen(int fd)
-{
-#if _EGL_PIPE_VMWGFX
-   struct svga_winsys_screen *sws;
-   struct pipe_screen *screen;
-
-   sws = svga_drm_winsys_screen_create(fd);
-   if (!sws)
-      return NULL;
-
-   screen = svga_screen_create(sws);
-   if (!screen)
-      return NULL;
-
-   screen = debug_screen_wrap(screen);
-
-   return screen;
-#else
-   return NULL;
-#endif
-}
-
-static struct pipe_screen *
-pipe_freedreno_create_screen(int fd)
-{
-#if _EGL_PIPE_FREEDRENO
-   struct pipe_screen *screen;
-
-   screen = fd_drm_screen_create(fd);
-   if (!screen)
-      return NULL;
-
-   screen = debug_screen_wrap(screen);
-
-   return screen;
-#else
-   return NULL;
-#endif
-}
-
-struct pipe_screen *
-egl_pipe_create_drm_screen(const char *name, int fd)
-{
-   if (strcmp(name, "i915") == 0)
-      return pipe_i915_create_screen(fd);
-   else if (strcmp(name, "i965") == 0)
-      return pipe_ilo_create_screen(fd);
-   else if (strcmp(name, "nouveau") == 0)
-      return pipe_nouveau_create_screen(fd);
-   else if (strcmp(name, "r300") == 0)
-      return pipe_r300_create_screen(fd);
-   else if (strcmp(name, "r600") == 0)
-      return pipe_r600_create_screen(fd);
-   else if (strcmp(name, "radeonsi") == 0)
-      return pipe_radeonsi_create_screen(fd);
-   else if (strcmp(name, "vmwgfx") == 0)
-      return pipe_vmwgfx_create_screen(fd);
-   else if ((strcmp(name, "kgsl") == 0) || (strcmp(name, "msm") == 0))
-      return pipe_freedreno_create_screen(fd);
-   else
-      return NULL;
-}
-
 struct pipe_screen *
 egl_pipe_create_swrast_screen(struct sw_winsys *ws)
 {