Mesa 10.2.3

7 files changed, 78 insertions, 31 deletions

diff --git a/lib/libGL/dri/Makefile.inc b/lib/libGL/dri/Makefile.inc
index 989551a12..06739ce77 100644
--- a/lib/libGL/dri/Makefile.inc
+++ b/lib/libGL/dri/Makefile.inc
@@ -1,5 +1,6 @@
-# $OpenBSD: Makefile.inc,v 1.18 2013/09/05 15:11:57 jsg Exp $
+# $OpenBSD: Makefile.inc,v 1.19 2014/07/09 21:32:40 jsg Exp $
 .include <bsd.xconf.mk>
+.include "../config.mk"
 
 TOP=		${.CURDIR}/../../../../dist/Mesa
 MESA=		${.CURDIR}/../../../../dist/Mesa/src/mesa
@@ -14,9 +15,12 @@ COMMON_GALLIUM_SOURCES = \
 
 COMMON_SOURCES = $(COMMON_GALLIUM_SOURCES) \
 	driverfuncs.c \
-	meta.c
+	meta_blit.c \
+	meta_generate_mipmap.c \
+	meta.c \
+	megadriver_stub.c
 
-CFLAGS+= -std=c99 -g -DIN_DRI_DRIVER -DGLX_DIRECT_RENDERING -DHAVE_PTHREAD \
+CFLAGS+= -DIN_DRI_DRIVER -DGLX_DIRECT_RENDERING \
 	 $(INCLUDES) $(DRIVER_DEFINES)
 
 INCLUDES = \
diff --git a/lib/libGL/dri/i965/Makefile b/lib/libGL/dri/i965/Makefile
index 820f2f4b6..b5656f172 100644
--- a/lib/libGL/dri/i965/Makefile
+++ b/lib/libGL/dri/i965/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.8 2013/09/05 15:11:57 jsg Exp $
+#	$OpenBSD: Makefile,v 1.9 2014/07/09 21:32:40 jsg Exp $
 
 LIB=	i965_dri.so
 
@@ -7,11 +7,10 @@ I965_FILES = \
 	intel_blit.c \
 	intel_buffer_objects.c \
 	intel_buffers.c \
-	intel_context.c \
+	intel_debug.c \
 	intel_extensions.c \
 	intel_fbo.c \
 	intel_mipmap_tree.c \
-	intel_regions.c \
 	intel_resolve_map.c \
 	intel_screen.c \
 	intel_pixel.c \
@@ -26,8 +25,11 @@ I965_FILES = \
 	intel_tex_image.c \
 	intel_tex_subimage.c \
 	intel_tex_validate.c \
+	intel_upload.c \
+	brw_binding_tables.c \
 	brw_blorp.cpp \
 	brw_blorp_blit.cpp \
+	brw_blorp_blit_eu.cpp \
 	brw_blorp_clear.cpp \
 	brw_cc.c \
 	brw_cfg.cpp \
@@ -42,6 +44,8 @@ I965_FILES = \
 	brw_context.c \
 	brw_cubemap_normalize.cpp \
 	brw_curbe.c \
+	brw_dead_control_flow.cpp \
+	brw_device_info.c \
 	brw_disasm.c \
 	brw_draw.c \
 	brw_draw_upload.c \
@@ -53,20 +57,34 @@ I965_FILES = \
 	brw_fs_channel_expressions.cpp \
 	brw_fs_copy_propagation.cpp \
 	brw_fs_cse.cpp \
-	brw_fs_emit.cpp \
+	brw_fs_dead_code_eliminate.cpp \
 	brw_fs_fp.cpp \
+	brw_fs_generator.cpp \
 	brw_fs_live_variables.cpp \
+	brw_fs_peephole_predicated_break.cpp \
 	brw_fs_reg_allocate.cpp \
+	brw_fs_register_coalesce.cpp \
+	brw_fs_saturate_propagation.cpp \
+	brw_fs_sel_peephole.cpp \
 	brw_fs_vector_splitting.cpp \
 	brw_fs_visitor.cpp \
 	brw_gs.c \
 	brw_gs_emit.c \
 	brw_gs_state.c \
+	brw_gs_surface_state.c \
+	brw_interpolation_map.c \
 	brw_lower_texture_gradients.cpp \
+	brw_lower_unnormalized_offset.cpp \
+	brw_meta_updownsample.c \
+	brw_meta_stencil_blit.c \
+	brw_meta_util.c \
 	brw_misc_state.c \
+	brw_object_purgeable.c \
+	brw_performance_monitor.c \
 	brw_program.c \
 	brw_primitive_restart.c \
 	brw_queryobj.c \
+	brw_reset.c \
 	brw_schedule_instructions.cpp \
 	brw_sf.c \
 	brw_sf_emit.c \
@@ -83,15 +101,17 @@ I965_FILES = \
 	brw_util.c \
 	brw_vec4.cpp \
 	brw_vec4_copy_propagation.cpp \
-	brw_vec4_emit.cpp \
+	brw_vec4_generator.cpp \
+	brw_vec4_gs.c \
+	brw_vec4_gs_visitor.cpp \
 	brw_vec4_live_variables.cpp \
 	brw_vec4_reg_allocate.cpp \
 	brw_vec4_visitor.cpp \
 	brw_vec4_vp.cpp \
+	brw_vec4_vs_visitor.cpp \
 	brw_vs.c \
 	brw_vs_state.c \
 	brw_vs_surface_state.c \
-	brw_vtbl.c \
 	brw_wm.c \
 	brw_wm_iz.cpp \
 	brw_wm_sampler_state.c \
@@ -113,8 +133,8 @@ I965_FILES = \
 	gen6_vs_state.c \
 	gen6_wm_state.c \
 	gen7_blorp.cpp \
-	gen7_clip_state.c \
 	gen7_disable.c \
+        gen7_gs_state.c \
 	gen7_misc_state.c \
 	gen7_sampler_state.c \
 	gen7_sf_state.c \
@@ -123,7 +143,26 @@ I965_FILES = \
 	gen7_viewport_state.c \
 	gen7_vs_state.c \
 	gen7_wm_state.c \
-	gen7_wm_surface_state.c
+	gen7_wm_surface_state.c \
+	gen8_blend_state.c \
+	gen8_disasm.c \
+	gen8_depth_state.c \
+	gen8_disable.c \
+	gen8_draw_upload.c \
+	gen8_fs_generator.cpp \
+	gen8_generator.cpp \
+	gen8_instruction.c \
+	gen8_gs_state.c \
+	gen8_misc_state.c \
+	gen8_multisample_state.c \
+	gen8_sf_state.c \
+	gen8_sol_state.c \
+	gen8_surface_state.c \
+	gen8_vec4_generator.cpp \
+	gen8_viewport_state.c \
+	gen8_vs_state.c \
+	gen8_wm_depth_stencil.c \
+	gen8_ps_state.c
 
 SRCS = \
 	$(COMMON_SOURCES) \
diff --git a/lib/libGL/dri/r300g/Makefile b/lib/libGL/dri/r300g/Makefile
index b5fe923f7..8c1c987cf 100644
--- a/lib/libGL/dri/r300g/Makefile
+++ b/lib/libGL/dri/r300g/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.3 2013/09/05 15:11:57 jsg Exp $
+#	$OpenBSD: Makefile,v 1.4 2014/07/09 21:32:40 jsg Exp $
 
 LIB=	r300_dri.so
 
@@ -36,14 +36,14 @@ COMMON_GALLIUM_SOURCES = \
 	dri_util.c \
 	xmlconfig.c
 
-DRIVER_SOURCES = \
-	target.c \
+DRIVER_SOURCES =
 
 SRCS = \
 	${WINSYS_SOURCES} \
 	${DRIDRM_SOURCES} \
 	${COMMON_GALLIUM_SOURCES} \
-	${DRIVER_SOURCES}
+	${DRIVER_SOURCES} \
+	drm_target.c
 
 LDADD=	../../mesa/libmesagallium/libmesagallium_pic.a \
 	../../glsl/libglsl/libglsl_pic.a \
@@ -57,5 +57,5 @@ DPADD=	../../mesa/libmesagallium/libmesagallium_pic.a
 
 .PATH: ${GALLIUM}/state_trackers/dri/common
 .PATH: ${GALLIUM}/state_trackers/dri/drm
-.PATH: ${GALLIUM}/targets/dri-r300
+.PATH: ${GALLIUM}/targets/r300/dri
 .PATH: ${GALLIUM}/winsys/radeon/drm
diff --git a/lib/libGL/dri/r600g/Makefile b/lib/libGL/dri/r600g/Makefile
index b74ac8721..8e2a58eb2 100644
--- a/lib/libGL/dri/r600g/Makefile
+++ b/lib/libGL/dri/r600g/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.3 2013/09/05 15:11:58 jsg Exp $
+#	$OpenBSD: Makefile,v 1.4 2014/07/09 21:32:40 jsg Exp $
 
 LIB=	r600_dri.so
 
@@ -37,14 +37,14 @@ COMMON_GALLIUM_SOURCES = \
 	dri_util.c \
 	xmlconfig.c
 
-DRIVER_SOURCES = \
-	target.c \
+DRIVER_SOURCES =
 
 SRCS = \
 	${WINSYS_SOURCES} \
 	${DRIDRM_SOURCES} \
 	${COMMON_GALLIUM_SOURCES} \
-	${DRIVER_SOURCES}
+	${DRIVER_SOURCES} \
+	drm_target.c
 
 LDADD=	../../mesa/libmesagallium/libmesagallium_pic.a \
 	../../glsl/libglsl/libglsl_pic.a \
@@ -58,5 +58,5 @@ DPADD=	../../mesa/libmesagallium/libmesagallium_pic.a
 
 .PATH: ${GALLIUM}/state_trackers/dri/common
 .PATH: ${GALLIUM}/state_trackers/dri/drm
-.PATH: ${GALLIUM}/targets/dri-r600
+.PATH: ${GALLIUM}/targets/r600/dri
 .PATH: ${GALLIUM}/winsys/radeon/drm
diff --git a/lib/libGL/dri/radeonsi/Makefile b/lib/libGL/dri/radeonsi/Makefile
index c216ca13b..68a366ae7 100644
--- a/lib/libGL/dri/radeonsi/Makefile
+++ b/lib/libGL/dri/radeonsi/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.1 2013/09/05 15:11:58 jsg Exp $
+#	$OpenBSD: Makefile,v 1.2 2014/07/09 21:32:40 jsg Exp $
 
 LIB=	radeonsi_dri.so
 
@@ -37,14 +37,14 @@ COMMON_GALLIUM_SOURCES = \
 	dri_util.c \
 	xmlconfig.c
 
-DRIVER_SOURCES = \
-	target.c \
+DRIVER_SOURCES =
 
 SRCS = \
 	${WINSYS_SOURCES} \
 	${DRIDRM_SOURCES} \
 	${COMMON_GALLIUM_SOURCES} \
-	${DRIVER_SOURCES}
+	${DRIVER_SOURCES} \
+	drm_target.c
 
 LDADD=	../../mesa/libmesagallium/libmesagallium_pic.a \
 	../../glsl/libglsl/libglsl_pic.a \
@@ -58,5 +58,5 @@ DPADD=	../../mesa/libmesagallium/libmesagallium_pic.a
 
 .PATH: ${GALLIUM}/state_trackers/dri/common
 .PATH: ${GALLIUM}/state_trackers/dri/drm
-.PATH: ${GALLIUM}/targets/dri-radeonsi
+.PATH: ${GALLIUM}/targets/radeonsi/dri
 .PATH: ${GALLIUM}/winsys/radeon/drm
diff --git a/lib/libGL/dri/swrast/Makefile b/lib/libGL/dri/swrast/Makefile
index ddf431fbd..66ff8fb56 100644
--- a/lib/libGL/dri/swrast/Makefile
+++ b/lib/libGL/dri/swrast/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.6 2014/01/11 12:39:14 miod Exp $
+#	$OpenBSD: Makefile,v 1.7 2014/07/09 21:32:40 jsg Exp $
 
 LIB=	swrast_dri.so
 
@@ -6,11 +6,15 @@ LIB=	swrast_dri.so
 PICFLAG = -fPIC
 .endif
 
-
 SWRAST_COMMON_SOURCES = \
         driverfuncs.c \
+	meta_blit.c \
+	meta_generate_mipmap.c \
+	meta.c \
+	dri_util.c \
         utils.c \
-	drisw_util.c
+	xmlconfig.c \
+	megadriver_stub.c
 
 DRIVER_SOURCES = \
 	swrast.c
diff --git a/lib/libGL/dri/swrastg/Makefile b/lib/libGL/dri/swrastg/Makefile
index d4f2dd297..8fdd627cf 100644
--- a/lib/libGL/dri/swrastg/Makefile
+++ b/lib/libGL/dri/swrastg/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.9 2013/09/05 15:11:58 jsg Exp $
+#	$OpenBSD: Makefile,v 1.10 2014/07/09 21:32:40 jsg Exp $
 
 LIB=	swrast_dri.so
 
@@ -32,7 +32,7 @@ DRISW_SOURCES = \
 
 SWRAST_COMMON_SOURCES = \
 	utils.c \
-	drisw_util.c \
+	dri_util.c \
 	xmlconfig.c
 
 DRIVER_SOURCES = \