diff options
Diffstat (limited to 'src/gallium/targets/egl-static')
-rw-r--r-- | src/gallium/targets/egl-static/Makefile | 10 | ||||
-rw-r--r-- | src/gallium/targets/egl-static/SConscript | 4 | ||||
-rw-r--r-- | src/gallium/targets/egl-static/egl_pipe.c | 30 |
3 files changed, 1 insertions, 43 deletions
diff --git a/src/gallium/targets/egl-static/Makefile b/src/gallium/targets/egl-static/Makefile index 17a578d43af..79a098af448 100644 --- a/src/gallium/targets/egl-static/Makefile +++ b/src/gallium/targets/egl-static/Makefile @@ -96,16 +96,6 @@ egl_LIBS += \ egl_SYS += -ldrm_intel endif -# i965 -ifneq ($(findstring i965/drm,$(GALLIUM_WINSYS_DIRS)),) -egl_CPPFLAGS += -D_EGL_PIPE_I995=1 -egl_LIBS += \ - $(TOP)/src/gallium/winsys/i965/drm/libi965drm.a \ - $(TOP)/src/gallium/drivers/i965/libi965.a \ - $(TOP)/src/gallium/winsys/sw/wrapper/libwsw.a -egl_SYS += -ldrm_intel -endif - # nouveau ifneq ($(findstring nouveau/drm,$(GALLIUM_WINSYS_DIRS)),) egl_CPPFLAGS += -D_EGL_PIPE_NOUVEAU=1 diff --git a/src/gallium/targets/egl-static/SConscript b/src/gallium/targets/egl-static/SConscript index a929d600349..e657e9f2ff5 100644 --- a/src/gallium/targets/egl-static/SConscript +++ b/src/gallium/targets/egl-static/SConscript @@ -90,12 +90,10 @@ if env['HAVE_DRM']: env.PkgUseModules('DRM') if env['HAVE_DRM_INTEL']: - env.Append(CPPDEFINES = ['_EGL_PIPE_I915', '_EGL_PIPE_I965']) + env.Append(CPPDEFINES = ['_EGL_PIPE_I915']) env.Prepend(LIBS = [ i915drm, i915, - i965drm, - i965, ws_wrapper, ]) diff --git a/src/gallium/targets/egl-static/egl_pipe.c b/src/gallium/targets/egl-static/egl_pipe.c index f2b50bd0eab..887bcfd12c4 100644 --- a/src/gallium/targets/egl-static/egl_pipe.c +++ b/src/gallium/targets/egl-static/egl_pipe.c @@ -32,10 +32,7 @@ /* for i915 */ #include "i915/drm/i915_drm_public.h" #include "i915/i915_public.h" -/* for i965 */ #include "target-helpers/inline_wrapper_sw_helper.h" -#include "i965/drm/i965_drm_public.h" -#include "i965/brw_public.h" /* for nouveau */ #include "nouveau/drm/nouveau_drm_public.h" /* for r300 */ @@ -71,31 +68,6 @@ pipe_i915_create_screen(int fd) } static struct pipe_screen * -pipe_i965_create_screen(int fd) -{ -#if _EGL_PIPE_I965 - struct brw_winsys_screen *bws; - struct pipe_screen *screen; - - bws = i965_drm_winsys_screen_create(fd); - if (!bws) - return NULL; - - screen = brw_screen_create(bws); - if (!screen) - return NULL; - - screen = sw_screen_wrap(screen); - - 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 @@ -187,8 +159,6 @@ 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_i965_create_screen(fd); else if (strcmp(name, "nouveau") == 0) return pipe_nouveau_create_screen(fd); else if (strcmp(name, "r300") == 0) |