i965g: Builds with scons

But there are some missing symbols, "nm -u i965_dri.so"
[SNIP]
                 U brw_surface_bo
                 U brw_surface_pitch
                 U brw_texture_blanket_winsys_buffer
                 U brw_texture_get_winsys_buffer
                 U brw_update_dirty_counts
[SNIP]

diff --git a/SConstruct b/SConstruct
index d53f4401e5ac0074e091ff79ab6f735d600ed60b..d4db812db5583dd4d8188d6b2b20a637a9ca8f7c 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -32,10 +32,10 @@ import common
 default_statetrackers = 'mesa'
 
 if common.default_platform in ('linux', 'freebsd', 'darwin'):
-       default_drivers = 'softpipe,failover,i915,trace,identity,llvmpipe'
+       default_drivers = 'softpipe,failover,i915,i965,trace,identity,llvmpipe'
        default_winsys = 'xlib'
 elif common.default_platform in ('winddk',):
-       default_drivers = 'softpipe,i915,trace,identity'
+       default_drivers = 'softpipe,i915,i965,trace,identity'
        default_winsys = 'all'
 else:
        default_drivers = 'all'
@@ -46,9 +46,9 @@ common.AddOptions(opts)
 opts.Add(ListVariable('statetrackers', 'state trackers to build', default_statetrackers,
                      ['mesa', 'python', 'xorg']))
 opts.Add(ListVariable('drivers', 'pipe drivers to build', default_drivers,
-                     ['softpipe', 'failover', 'i915', 'cell', 'trace', 'r300', 'identity', 'llvmpipe']))
+                     ['softpipe', 'failover', 'i915', 'i965', 'cell', 'trace', 'r300', 'identity', 'llvmpipe']))
 opts.Add(ListVariable('winsys', 'winsys drivers to build', default_winsys,
-                     ['xlib', 'intel', 'gdi', 'radeon']))
+                     ['xlib', 'intel', 'i965', 'gdi', 'radeon']))
 
 opts.Add(EnumVariable('MSVS_VERSION', 'MS Visual C++ version', None, allowed_values=('7.1', '8.0', '9.0')))
 

diff --git a/src/gallium/drivers/i965/SConscript b/src/gallium/drivers/i965/SConscript
new file mode 100644 (file)
index 0000000..c517b08
--- /dev/null
+++ b/src/gallium/drivers/i965/SConscript
@@ -0,0 +1,77 @@
+Import('*')
+
+env = env.Clone()
+
+i965 = env.ConvenienceLibrary(
+       target = 'i965',
+       source = [
+               'brw_batchbuffer.c',
+               'brw_cc.c',
+               'brw_clip.c',
+               'brw_clip_line.c',
+               'brw_clip_point.c',
+               'brw_clip_state.c',
+               'brw_clip_tri.c',
+               'brw_clip_unfilled.c',
+               'brw_clip_util.c',
+               'brw_context.c',
+               'brw_curbe.c',
+               'brw_disasm.c',
+               'brw_draw.c',
+               'brw_draw_upload.c',
+               'brw_eu.c',
+               'brw_eu_debug.c',
+               'brw_eu_emit.c',
+               'brw_eu_util.c',
+               'brw_gs.c',
+               'brw_gs_emit.c',
+               'brw_gs_state.c',
+               'brw_misc_state.c',
+               'brw_pipe_blend.c',
+               'brw_pipe_clear.c',
+               'brw_pipe_depth.c',
+               'brw_pipe_fb.c',
+               'brw_pipe_flush.c',
+               'brw_pipe_misc.c',
+               'brw_pipe_query.c',
+               'brw_pipe_rast.c',
+               'brw_pipe_sampler.c',
+               'brw_pipe_shader.c',
+               'brw_pipe_vertex.c',
+               'brw_screen_buffers.c',
+               'brw_screen.c',
+               'brw_screen_surface.c',
+               'brw_screen_tex_layout.c',
+               'brw_screen_texture.c',
+               'brw_sf.c',
+               'brw_sf_emit.c',
+               'brw_sf_state.c',
+               'brw_state_batch.c',
+               'brw_state_cache.c',
+#              'brw_state_debug.c',
+               'brw_state_dump.c',
+               'brw_state_upload.c',
+               'brw_swtnl.c',
+               'brw_urb.c',
+               'brw_util.c',
+               'brw_vs.c',
+               'brw_vs_emit.c',
+               'brw_vs_state.c',
+               'brw_vs_surface_state.c',
+               'brw_wm.c',
+#              'brw_wm_constant_buffer.c',
+               'brw_wm_debug.c',
+               'brw_wm_emit.c',
+               'brw_wm_fp.c',
+#              'brw_wm_glsl.c',
+               'brw_wm_iz.c',
+               'brw_wm_pass0.c',
+               'brw_wm_pass1.c',
+               'brw_wm_pass2.c',
+               'brw_wm_sampler_state.c',
+               'brw_wm_state.c',
+               'brw_wm_surface_state.c',
+               'intel_decode.c',
+       ])
+
+Export('i965')

diff --git a/src/gallium/winsys/drm/SConscript b/src/gallium/winsys/drm/SConscript
index a9e9f2682a7eb36ffac1a5b3222e3ef8bb2fe44f..ba389d8ed3654d4ee2afc734f81c78ac80c2bb57 100644 (file)
--- a/src/gallium/winsys/drm/SConscript
+++ b/src/gallium/winsys/drm/SConscript
@@ -53,6 +53,11 @@ if env['dri']:
                        'intel/SConscript',
                ])
 
+       if 'i965' in env['winsys']:
+               SConscript([
+                       'i965/SConscript',
+               ])
+
        if 'radeon' in env['winsys']:
                SConscript([
                        'radeon/SConscript',