Module Name: src
Committed By: riastradh
Date: Tue Jul 22 18:14:25 UTC 2014
Modified Files:
src/external/mit/xorg/lib/dri/r200: Makefile
src/external/mit/xorg/lib/dri/r300: Makefile
src/external/mit/xorg/lib/dri/r600: Makefile
Log Message:
Fix source lists for radeon dri modules.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/external/mit/xorg/lib/dri/r200/Makefile
cvs rdiff -u -r1.9 -r1.10 src/external/mit/xorg/lib/dri/r300/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/lib/dri/r600/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/dri/r200/Makefile
diff -u src/external/mit/xorg/lib/dri/r200/Makefile:1.9 src/external/mit/xorg/lib/dri/r200/Makefile:1.10
--- src/external/mit/xorg/lib/dri/r200/Makefile:1.9 Wed Jul 9 20:22:55 2014
+++ src/external/mit/xorg/lib/dri/r200/Makefile Tue Jul 22 18:14:25 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2014/07/09 20:22:55 riastradh Exp $
+# $NetBSD: Makefile,v 1.10 2014/07/22 18:14:25 riastradh Exp $
MODULE= r200
@@ -12,6 +12,7 @@ CPPFLAGS+= -I${X11SRCDIR.MesaLib}/src/me
DRI_EXTRA_PATHS= ${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/radeon
SRCS= \
radeon_bo_legacy.c \
+ radeon_buffer_objects.c \
radeon_common_context.c \
radeon_common.c \
radeon_cs_legacy.c \
@@ -20,25 +21,30 @@ SRCS= \
radeon_fbo.c \
radeon_lock.c \
radeon_mipmap_tree.c \
+ radeon_pixel_read.c \
radeon_queryobj.c \
radeon_span.c \
- radeon_tex_copy.c \
radeon_texture.c \
- r200_blit.c \
- r200_context.c \
- r200_ioctl.c \
- r200_state.c \
- r200_state_init.c \
- r200_cmdbuf.c \
- r200_tex.c \
- r200_texstate.c \
- r200_tcl.c \
- r200_swtcl.c \
- r200_maos.c \
- r200_sanity.c \
- r200_fragshader.c \
- r200_vertprog.c \
- radeon_screen.c
+ radeon_tex_copy.c \
+ radeon_tex_getimage.c \
+ radeon_tile.c
+
+SRCS+= \
+ r200_context.c \
+ r200_ioctl.c \
+ r200_state.c \
+ r200_state_init.c \
+ r200_cmdbuf.c \
+ r200_tex.c \
+ r200_texstate.c \
+ r200_tcl.c \
+ r200_swtcl.c \
+ r200_maos.c \
+ r200_sanity.c \
+ r200_fragshader.c \
+ r200_vertprog.c \
+ r200_blit.c \
+ radeon_screen.c
SRCS+= \
radeon_cs_space_drm.c \
Index: src/external/mit/xorg/lib/dri/r300/Makefile
diff -u src/external/mit/xorg/lib/dri/r300/Makefile:1.9 src/external/mit/xorg/lib/dri/r300/Makefile:1.10
--- src/external/mit/xorg/lib/dri/r300/Makefile:1.9 Wed Jul 9 20:22:55 2014
+++ src/external/mit/xorg/lib/dri/r300/Makefile Tue Jul 22 18:14:25 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2014/07/09 20:22:55 riastradh Exp $
+# $NetBSD: Makefile,v 1.10 2014/07/22 18:14:25 riastradh Exp $
MODULE= r300
@@ -14,7 +14,10 @@ CPPFLAGS+= -I${X11SRCDIR.MesaLib}/src/me
-I${X11SRCDIR.MesaLib}/src/glsl
DRI_EXTRA_PATHS= ${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/radeon \
- ${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/r300/compiler
+ ${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/r300/compiler \
+ ${X11SRCDIR.MesaLib}/src/glsl \
+ ${X11SRCDIR.MesaLib}/src/mesa/program
+
SRCS= \
radeon_bo_legacy.c \
radeon_buffer_objects.c \
@@ -26,25 +29,30 @@ SRCS= \
radeon_fbo.c \
radeon_lock.c \
radeon_mipmap_tree.c \
- radeon_span.c \
+ radeon_pixel_read.c \
radeon_queryobj.c \
- radeon_tex_copy.c \
+ radeon_span.c \
radeon_texture.c \
- radeon_screen.c \
- r300_blit.c \
- r300_context.c \
- r300_draw.c \
- r300_cmdbuf.c \
- r300_state.c \
- r300_render.c \
- r300_tex.c \
- r300_texstate.c \
- r300_vertprog.c \
- r300_fragprog_common.c \
- r300_shader.c \
- radeon_mesa_to_rc.c \
- r300_emit.c \
- r300_swtcl.c
+ radeon_tex_copy.c \
+ radeon_tex_getimage.c \
+ radeon_tile.c
+
+SRCS+= \
+ radeon_screen.c \
+ r300_blit.c \
+ r300_context.c \
+ r300_draw.c \
+ r300_cmdbuf.c \
+ r300_state.c \
+ r300_render.c \
+ r300_tex.c \
+ r300_texstate.c \
+ r300_vertprog.c \
+ r300_fragprog_common.c \
+ r300_shader.c \
+ radeon_mesa_to_rc.c \
+ r300_emit.c \
+ r300_swtcl.c
SRCS+= \
radeon_cs_space_drm.c \
@@ -53,28 +61,44 @@ SRCS+= \
# r300/compiler
SRCS+= \
- radeon_code.c \
- radeon_compiler.c \
- radeon_program.c \
- radeon_program_print.c \
- radeon_opcodes.c \
- radeon_program_alu.c \
- radeon_program_pair.c \
- radeon_pair_translate.c \
- radeon_pair_schedule.c \
- radeon_pair_regalloc.c \
- radeon_dataflow.c \
- radeon_dataflow_deadcode.c \
- radeon_dataflow_swizzles.c \
- r3xx_fragprog.c \
- r300_fragprog.c \
- r300_fragprog_swizzle.c \
- r300_fragprog_emit.c \
- r500_fragprog.c \
- r500_fragprog_emit.c \
- r3xx_vertprog.c \
- r3xx_vertprog_dump.c \
- memory_pool.c
+ radeon_code.c \
+ radeon_compiler.c \
+ radeon_compiler_util.c \
+ radeon_emulate_branches.c \
+ radeon_emulate_loops.c \
+ radeon_program.c \
+ radeon_program_print.c \
+ radeon_opcodes.c \
+ radeon_program_alu.c \
+ radeon_program_pair.c \
+ radeon_program_tex.c \
+ radeon_pair_translate.c \
+ radeon_pair_schedule.c \
+ radeon_pair_regalloc.c \
+ radeon_pair_dead_sources.c \
+ radeon_dataflow.c \
+ radeon_dataflow_deadcode.c \
+ radeon_dataflow_swizzles.c \
+ radeon_list.c \
+ radeon_optimize.c \
+ radeon_remove_constants.c \
+ radeon_rename_regs.c \
+ radeon_variable.c \
+ r3xx_fragprog.c \
+ r300_fragprog.c \
+ r300_fragprog_swizzle.c \
+ r300_fragprog_emit.c \
+ r500_fragprog.c \
+ r500_fragprog_emit.c \
+ r3xx_vertprog.c \
+ r3xx_vertprog_dump.c \
+ memory_pool.c
+
+# glsl
+SRCS+= ralloc.c
+
+# mesa/program
+SRCS+= register_allocate.c
LIBDPLIBS+= drm_radeon ${.CURDIR}/../../libdrm_radeon
Index: src/external/mit/xorg/lib/dri/r600/Makefile
diff -u src/external/mit/xorg/lib/dri/r600/Makefile:1.6 src/external/mit/xorg/lib/dri/r600/Makefile:1.7
--- src/external/mit/xorg/lib/dri/r600/Makefile:1.6 Sun Jul 13 16:35:49 2014
+++ src/external/mit/xorg/lib/dri/r600/Makefile Tue Jul 22 18:14:25 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2014/07/13 16:35:49 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2014/07/22 18:14:25 riastradh Exp $
MODULE= r600
@@ -24,29 +24,44 @@ SRCS= \
radeon_fbo.c \
radeon_lock.c \
radeon_mipmap_tree.c \
+ radeon_pixel_read.c \
+ radeon_queryobj.c \
radeon_span.c \
radeon_texture.c \
- radeon_queryobj.c \
- radeon_screen.c \
radeon_tex_copy.c \
- r600_blit.c \
- r600_context.c \
- r600_cmdbuf.c \
- r600_emit.c \
- r700_assembler.c \
- r700_fragprog.c \
- r700_vertprog.c \
- r700_shader.c \
- r700_shaderinst.c \
- r700_ioctl.c \
- r700_oglprog.c \
- r700_chip.c \
- r700_state.c \
- r700_clear.c \
- r700_render.c \
- r600_tex.c \
- r600_texstate.c \
- r700_debug.c
+ radeon_tex_getimage.c \
+ radeon_tile.c
+
+SRCS+= \
+ radeon_screen.c \
+ r600_context.c \
+ r600_cmdbuf.c \
+ r600_emit.c \
+ r700_assembler.c \
+ r700_fragprog.c \
+ r700_vertprog.c \
+ r700_shader.c \
+ r700_shaderinst.c \
+ r700_ioctl.c \
+ r700_oglprog.c \
+ r700_chip.c \
+ r700_state.c \
+ r700_clear.c \
+ r700_render.c \
+ r600_tex.c \
+ r600_texstate.c \
+ r600_blit.c \
+ r700_debug.c \
+ evergreen_context.c \
+ evergreen_state.c \
+ evergreen_tex.c \
+ evergreen_ioctl.c \
+ evergreen_render.c \
+ evergreen_chip.c \
+ evergreen_vertprog.c \
+ evergreen_fragprog.c \
+ evergreen_oglprog.c \
+ evergreen_blit.c
SRCS+= \
radeon_cs_space_drm.c \
