head	1.2;
access;
symbols
	netbsd-7-2-RELEASE:1.1.1.2.2.1
	netbsd-7-1-2-RELEASE:1.1.1.2.2.1
	netbsd-7-1-1-RELEASE:1.1.1.2.2.1
	netbsd-7-1:1.1.1.2.2.1.0.4
	netbsd-7-1-RELEASE:1.1.1.2.2.1
	netbsd-7-1-RC2:1.1.1.2.2.1
	netbsd-7-1-RC1:1.1.1.2.2.1
	netbsd-7-0-2-RELEASE:1.1.1.2.2.1
	netbsd-7-0-1-RELEASE:1.1.1.2.2.1
	netbsd-7-0:1.1.1.2.2.1.0.2
	netbsd-7-0-RELEASE:1.1.1.2.2.1
	netbsd-7-0-RC3:1.1.1.2.2.1
	netbsd-7-0-RC2:1.1.1.2.2.1
	netbsd-7-0-RC1:1.1.1.2.2.1
	netbsd-6-0-6-RELEASE:1.1.1.1
	netbsd-6-1-5-RELEASE:1.1.1.1
	netbsd-7:1.1.1.2.0.2
	netbsd-7-base:1.1.1.2
	MesaLib-7-11-2:1.1.1.2
	netbsd-6-1-4-RELEASE:1.1.1.1
	netbsd-6-0-5-RELEASE:1.1.1.1
	riastradh-xf86-video-intel-2-7-1-pre-2-21-15:1.1.1.1
	riastradh-drm2:1.1.1.1.0.8
	riastradh-drm2-base:1.1.1.1
	netbsd-6-1-3-RELEASE:1.1.1.1
	netbsd-6-0-4-RELEASE:1.1.1.1
	netbsd-6-1-2-RELEASE:1.1.1.1
	netbsd-6-0-3-RELEASE:1.1.1.1
	netbsd-6-1-1-RELEASE:1.1.1.1
	netbsd-6-1:1.1.1.1.0.6
	netbsd-6-0-2-RELEASE:1.1.1.1
	netbsd-6-1-RELEASE:1.1.1.1
	netbsd-6-1-RC4:1.1.1.1
	netbsd-6-1-RC3:1.1.1.1
	netbsd-6-1-RC2:1.1.1.1
	netbsd-6-1-RC1:1.1.1.1
	netbsd-6-0-1-RELEASE:1.1.1.1
	netbsd-6-0:1.1.1.1.0.4
	netbsd-6-0-RELEASE:1.1.1.1
	netbsd-6-0-RC2:1.1.1.1
	netbsd-6-0-RC1:1.1.1.1
	netbsd-6:1.1.1.1.0.2
	netbsd-6-base:1.1.1.1
	MesaLib-7-8-2:1.1.1.1
	xorg:1.1.1;
locks; strict;
comment	@# @;


1.2
date	2014.12.18.06.11.30;	author mrg;	state dead;
branches;
next	1.1;
commitid	Ae59RsLlS9l0cu2y;

1.1
date	2010.07.19.05.31.43;	author mrg;	state Exp;
branches
	1.1.1.1;
next	;

1.1.1.1
date	2010.07.19.05.31.43;	author mrg;	state Exp;
branches;
next	1.1.1.2;

1.1.1.2
date	2014.07.09.19.39.00;	author riastradh;	state Exp;
branches
	1.1.1.2.2.1;
next	;
commitid	h96CLViPL8qdRJHx;

1.1.1.2.2.1
date	2015.01.06.09.26.19;	author martin;	state dead;
branches;
next	;
commitid	2BxXkbQgg8gLEW4y;


desc
@@


1.2
log
@merge Mesa 10.3.5.
@
text
@# src/egl/drivers/dri2/Makefile

TOP = ../../../..
include $(TOP)/configs/current

EGL_DRIVER = egl_dri2.so
EGL_SOURCES = egl_dri2.c

EGL_INCLUDES = \
	-I$(TOP)/include \
	-I$(TOP)/src/egl/main \
	-I$(TOP)/src/mesa \
	-DDEFAULT_DRIVER_DIR=\"$(DRI_DRIVER_SEARCH_DIR)\" \
	$(EGL_DRI2_CFLAGS)

EGL_LIBS = $(EGL_DRI2_LIBS)

include ../Makefile.template
@


1.1
log
@Initial revision
@
text
@@


1.1.1.1
log
@import Mesa 7.8.2, lib part.  major changes since 7.7.1:
- several new extensions for various drivers
- many i965, i915 driver fixes
- many glsl fixes
@
text
@@


1.1.1.2
log
@import MesaLib 7.11.2

Brings in support for Intel Sandy Bridge and Ivy Bridge hardware, a
new shader language compiler, and various other improvements too
numerous to list here; see <http://www.mesa3d.org/relnotes.html> for
details.
@
text
@d6 2
a7 2
EGL_DRIVER = egl_dri2
EGL_SOURCES = egl_dri2.c common.c
d12 1
a12 3
	-I$(TOP)/src/mapi \
	-I$(TOP)/src/gbm/main \
	-I$(TOP)/src/gbm/backends/dri \
d14 1
a14 2
	$(LIBUDEV_CFLAGS) \
	$(LIBDRM_CFLAGS)
d16 1
a16 28
EGL_LIBS = $(LIBUDEV_LIBS) $(DLOPEN_LIBS) $(LIBDRM_LIB)

EGL_CFLAGS = -D_EGL_MAIN=_eglBuiltInDriverDRI2
EGL_BUILTIN = true

ifeq ($(SHARED_GLAPI),1)
EGL_CFLAGS += -DHAVE_SHARED_GLAPI
endif

ifneq ($(findstring x11, $(EGL_PLATFORMS)),)
EGL_SOURCES += platform_x11.c
EGL_INCLUDES += -DHAVE_X11_PLATFORM $(XCB_DRI2_CFLAGS)
EGL_LIBS +=  $(XCB_DRI2_LIBS)
endif

ifneq ($(findstring drm, $(EGL_PLATFORMS)),)
EGL_SOURCES += platform_drm.c
EGL_INCLUDES += -DHAVE_DRM_PLATFORM
endif

ifneq ($(findstring wayland, $(EGL_PLATFORMS)),)
EGL_SOURCES += platform_wayland.c
EGL_INCLUDES += -DHAVE_WAYLAND_PLATFORM $(WAYLAND_CFLAGS) \
		-I$(TOP)/src/egl/wayland/wayland-egl \
		-I$(TOP)/src/egl/wayland/wayland-drm
EGL_LIBS += $(WAYLAND_LIBS) \
	    $(TOP)/src/egl/wayland/wayland-drm/libwayland-drm.a
endif
@


1.1.1.2.2.1
log
@File removals that accidently did not happen during pullup of the new
MesaLib for ticket #381
@
text
@@