qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Include the software winsys and state tracker sources in the swrastg

Browse Source 
driver rather than in the libmesagallium build. This non functional
change allows to use the libmesagallium in any gallium target (r300g,
nouveau...)
This commit is contained in:
mpi 2012-11-28 13:53:16 +00:00
parent 5bcdec7171
commit 26df0b43a8
4 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/libGL/dri/Makefile.inc
View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile.inc,v 1.15 2012/08/26 18:46:42 mpi Exp $
# $OpenBSD: Makefile.inc,v 1.16 2012/11/28 13:53:16 mpi Exp $
.include <bsd.xconf.mk>
MESA= ${.CURDIR}/../../../../dist/Mesa/src/mesa
TOP= ${.CURDIR}/../../../../dist/Mesa
TOP= ${.CURDIR}/../../../../dist/Mesa
MESA= ${.CURDIR}/../../../../dist/Mesa/src/mesa
GALLIUM= ${.CURDIR}/../../../../dist/Mesa/src/gallium
DRI_DRIVER_INSTALL_DIR= ${X11BASE}/lib/modules/dri

21
lib/libGL/dri/swrastg/Makefile
View File

@ -1,14 +1,13 @@
# $OpenBSD: Makefile,v 1.5 2012/11/11 12:09:09 mpi Exp $
# $OpenBSD: Makefile,v 1.6 2012/11/28 13:53:16 mpi Exp $
LIB= swrastg_dri.so
GALLIUM= ${.CURDIR}/../../../../dist/Mesa/src/gallium
CPPFLAGS= \
-I${GALLIUM}/include \
-I${GALLIUM}/auxiliary \
-I${GALLIUM}/drivers \
-I${GALLIUM}/winsys/sw/dri
-I${GALLIUM}/winsys/sw/dri \
-I${GALLIUM}/state_trackers/dri/common \
DRIVER_LIBS= \
../../gallium/drivers/trace/libtrace_pic.a \
@ -25,6 +24,15 @@ DRIVER_DEFINES = \
-DGALLIUM_RBUG \
-DGALLIUM_TRACE
WINSYS_SOURCES = \
dri_sw_winsys.c
DRISW_SOURCES = \
dri_context.c \
dri_screen.c \
dri_drawable.c \
drisw.c
SWRAST_COMMON_SOURCES = \
utils.c \
drisw_util.c \
@ -34,6 +42,8 @@ DRIVER_SOURCES = \
swrast_drm_api.c
SRCS = \
${WINSYS_SOURCES} \
${DRISW_SOURCES} \
${SWRAST_COMMON_SOURCES} \
${DRIVER_SOURCES}
@ -47,4 +57,7 @@ DPADD= ../../mesa/libmesagallium/libmesagallium_pic.a
.include "../../gallium/Makefile.inc"
.include <bsd.xorg.mk>
.PATH: ${GALLIUM}/state_trackers/dri/common
.PATH: ${GALLIUM}/state_trackers/dri/sw
.PATH: ${GALLIUM}/targets/dri-swrast
.PATH: ${GALLIUM}/winsys/sw/dri

16
lib/libGL/mesa/Makefile.inc
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile.inc,v 1.1 2012/08/26 18:46:42 mpi Exp $
# $OpenBSD: Makefile.inc,v 1.2 2012/11/28 13:53:16 mpi Exp $
MESA= ${.CURDIR}/../../../../dist/Mesa/src/mesa
MAPI= ${.CURDIR}/../../../../dist/Mesa/src/mapi
@ -359,14 +359,6 @@ COMMON_DRIVER_SOURCES = \
driverfuncs.c \
meta.c
# drisw
DRISW_SOURCES = \
dri_sw_winsys.c \
dri_context.c \
dri_screen.c \
dri_drawable.c \
drisw.c
MESA_SOURCES = \
$(MAIN_SOURCES) \
$(MATH_SOURCES) \
@ -389,8 +381,7 @@ MESAGALLIUM_SOURCES = \
${VBO_SOURCES} \
${PROGRAM_SOURCES} \
${STATETRACKER_SOURCES} \
${ASM_C_SOURCES} \
${DRISW_SOURCES}
${ASM_C_SOURCES}
MESAGALLIUM_CXX_SOURCES = \
${MAIN_CXX_SOURCES} \
@ -501,9 +492,6 @@ x86_xform4.so: matypes.h
.PATH: ${MESA}/program
.PATH: ${MESA}/vbo
.PATH: ${MESA}/drivers/common
.PATH: ${GALLIUM}/winsys/sw/dri
.PATH: ${GALLIUM}/state_trackers/dri/sw
.PATH: ${GALLIUM}/state_trackers/dri/common
.PATH: ${.CURDIR}/..
.PATH: ${.CURDIR}/../generated

3
lib/libGL/mesa/libmesagallium/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.1 2012/08/26 18:46:42 mpi Exp $
# $OpenBSD: Makefile,v 1.2 2012/11/28 13:53:16 mpi Exp $
LIB= mesagallium
@ -6,7 +6,6 @@ CPPFLAGS+= \
-I${MESA}/drivers/dri/common \
-I${GALLIUM}/auxiliary \
-I${GALLIUM}/include \
-I${GALLIUM}/state_trackers/dri/common \
-DHAVE_POSIX_MEMALIGN \
-D__NOT_HAVE_DRM_H