mesa: Changes to 'upstream-experimental'
.gitignore | 1
Makefile | 30
bin/mklib | 139
configs/aix-gcc | 4
configs/beos | 4
configs/bluegene-osmesa | 33
configs/bluegene-xlc-osmesa | 29
configs/catamount-osmesa-pgi | 32
configs/config.mgw | 42
configs/darwin | 27
configs/darwin-fat-32bit | 7
configs/darwin-fat-all | 7
configs/darwin-static | 4
configs/darwin-static-x86ppc | 4
configs/darwin-x86ppc | 33
configs/default | 13
configs/dragonfly | 38
configs/dragonfly-dri | 56
configs/dragonfly-dri-amd64 | 10
configs/dragonfly-dri-x86 | 13
configs/freebsd | 6
configs/freebsd-dri | 6
configs/freebsd-static | 27
configs/hpux10-gcc | 4
configs/linux | 4
configs/linux-alpha | 4
configs/linux-alpha-static | 4
configs/linux-directfb | 4
configs/linux-dri | 9
configs/linux-dri-x86 | 3
configs/linux-dri-xcb | 12
configs/linux-fbdev | 3
configs/linux-glide | 3
configs/linux-indirect | 3
configs/linux-osmesa | 3
configs/linux-osmesa16 | 3
configs/linux-osmesa16-static | 4
configs/linux-osmesa32 | 3
configs/linux-ppc-static | 1
configs/linux-solo | 3
configs/linux-solo-x86 | 3
configs/linux-static | 6
configs/linux-x86-64-static | 5
configs/linux-x86-glide | 3
configs/linux-x86-static | 5
configs/netbsd | 3
configs/openbsd | 4
configs/solaris-x86-gcc | 4
configs/solaris-x86-gcc-static | 4
configs/sunos4-gcc | 4
configs/sunos5-gcc | 4
configs/sunos5-v9-cc-g++ | 35
configs/ultrix-gcc | 4
docs/download.html | 2
docs/faq.html | 2
docs/fbdev-dri.html | 197
docs/helpwanted.html | 39
docs/install.html | 83
docs/license.html | 29
docs/memory.html | 21
docs/modelers.html | 2
docs/news.html | 38
docs/relnotes-7.0.1.html | 17
docs/relnotes-7.0.2.html | 88
docs/relnotes-7.0.3.html | 84
docs/relnotes-7.0.4.html | 67
docs/relnotes.html | 3
docs/shading.html | 1
include/GL/glext.h | 19
include/GL/glu.h | 27
include/GL/glutf90.h | 4
include/GL/internal/dri_interface.h | 12
progs/beos/.gitignore | 3
progs/beos/Makefile | 10
progs/demos/.gitignore | 14
progs/demos/Makefile | 14
progs/demos/engine.c | 4
progs/directfb/.gitignore | 4
progs/directfb/Makefile | 4
progs/egl/.gitignore | 5
progs/egl/Makefile | 10
progs/fbdev/.gitignore | 1
progs/fbdev/Makefile | 3
progs/fp/.gitignore | 42
progs/fp/Makefile | 2
progs/glsl/.gitignore | 13
progs/glsl/Makefile | 6
progs/glsl/bump.c | 6
progs/glsl/mandelbrot.c | 6
progs/glsl/noise.c | 2
progs/glsl/toyball.c | 6
progs/miniglx/.gitignore | 6
progs/miniglx/Makefile | 4
progs/osdemos/.gitignore | 8
progs/osdemos/Makefile | 12
progs/redbook/Makefile | 4
progs/samples/.gitignore | 32
progs/samples/Makefile | 6
progs/slang/.gitignore | 3
progs/slang/Makefile | 8
progs/tests/.gitignore | 11
progs/tests/Makefile | 27
progs/tests/shader_api.c | 337
progs/tools/trace/.gitignore | 1
progs/tools/trace/Makefile | 2
progs/trivial/.gitignore | 65
progs/trivial/Makefile | 8
progs/trivial/quad-clip-nearplane.c | 43
progs/vp/.gitignore | 1
progs/vp/Makefile | 4
progs/xdemos/.gitignore | 11
progs/xdemos/Makefile | 47
progs/xdemos/glthreads.c | 2
progs/xdemos/glxinfo.c | 2
progs/xdemos/offset.c | 3
progs/xdemos/shape.c | 1
src/egl/drivers/demo/Makefile | 2
src/egl/drivers/dri/Makefile | 2
src/egl/main/Makefile | 2
src/glu/Makefile | 16
src/glu/glu.pc.in | 11
src/glu/mesa/Makefile | 2
src/glu/sgi/Makefile | 2
src/glu/sgi/libnurbs/interface/bezierPatch.cc | 7
src/glu/sgi/libnurbs/interface/insurfeval.cc | 4
src/glu/sgi/libutil/error.c | 2
src/glu/sgi/libutil/mipmap.c | 4
src/glu/sgi/libutil/project.c | 115
src/glu/sgi/libutil/quad.c | 4
src/glut/beos/Makefile | 3
src/glut/directfb/Makefile | 2
src/glut/fbdev/Makefile | 10
src/glut/ggi/Makefile | 2
src/glut/glx/Makefile | 25
src/glut/glx/glut.pc.in | 11
src/glut/glx/glut_dstr.c | 1
src/glut/glx/glut_event.c | 8
src/glut/glx/glut_fbc.c | 164
src/glut/glx/glut_fcb.c | 164
src/glut/mini/Makefile | 19
src/glut/mini/glut.pc.in | 11
src/glw/Makefile | 24
src/glw/glw.pc.in | 11
src/glx/mini/Makefile | 6
src/glx/x11/Makefile | 2
src/glx/x11/glxext.c | 7
src/glx/x11/indirect_dispatch.c | 5914 +++++++++++++++
src/glx/x11/indirect_dispatch.h | 1043 ++
src/glx/x11/indirect_dispatch_swap.c | 6076 ++++++++++++++++
src/glx/x11/indirect_reqsize.c | 832 ++
src/glx/x11/indirect_reqsize.h | 121
src/glx/x11/indirect_size_get.c | 1206 +++
src/glx/x11/indirect_size_get.h | 102
src/glx/x11/indirect_table.c | 1593 ++++
src/glx/x11/indirect_vertex_array.c | 22
src/mesa/Makefile | 47
src/mesa/drivers/beos/Makefile | 3
src/mesa/drivers/common/driverfuncs.c | 2
src/mesa/drivers/dri/Makefile.template | 7
src/mesa/drivers/dri/common/dri_bufmgr.c | 2
src/mesa/drivers/dri/common/dri_drmpool.c | 1
src/mesa/drivers/dri/common/dri_util.c | 6
src/mesa/drivers/dri/common/dri_util.h | 6
src/mesa/drivers/dri/common/extension_helper.h | 18
src/mesa/drivers/dri/common/spantmp2.h | 2
src/mesa/drivers/dri/common/vblank.c | 4
src/mesa/drivers/dri/common/xmlconfig.c | 3
src/mesa/drivers/dri/gamma/gamma_render.c | 2
src/mesa/drivers/dri/glcore/Makefile | 3
src/mesa/drivers/dri/i810/i810render.c | 2
src/mesa/drivers/dri/i810/i810screen.c | 2
src/mesa/drivers/dri/i915/i915_context.h | 6
src/mesa/drivers/dri/i915/i915_fragprog.c | 313
src/mesa/drivers/dri/i915/i915_program.c | 38
src/mesa/drivers/dri/i915/i915_program.h | 1
src/mesa/drivers/dri/i915/i915_texprog.c | 2
src/mesa/drivers/dri/i915/i915_texstate.c | 35
src/mesa/drivers/dri/i915/intel_context.c | 10
src/mesa/drivers/dri/i915/intel_context.h | 7
src/mesa/drivers/dri/i915/intel_pixel.c | 8
src/mesa/drivers/dri/i915/intel_render.c | 2
src/mesa/drivers/dri/i915/intel_screen.c | 7
src/mesa/drivers/dri/i915/intel_state.c | 4
src/mesa/drivers/dri/i915/intel_tex.c | 8
src/mesa/drivers/dri/i915/intel_tris.c | 30
src/mesa/drivers/dri/i915tex/i830_reg.h | 1
src/mesa/drivers/dri/i915tex/i830_texstate.c | 41
src/mesa/drivers/dri/i915tex/i830_vtbl.c | 84
src/mesa/drivers/dri/i915tex/i915_fragprog.c | 2
src/mesa/drivers/dri/i915tex/i915_metaops.c | 2
src/mesa/drivers/dri/i915tex/i915_tex_layout.c | 18
src/mesa/drivers/dri/i915tex/i915_texstate.c | 49
src/mesa/drivers/dri/i915tex/i915_vtbl.c | 71
src/mesa/drivers/dri/i915tex/intel_batchbuffer.c | 2
src/mesa/drivers/dri/i915tex/intel_batchbuffer.h | 3
src/mesa/drivers/dri/i915tex/intel_blit.c | 35
src/mesa/drivers/dri/i915tex/intel_buffers.c | 59
src/mesa/drivers/dri/i915tex/intel_context.c | 14
src/mesa/drivers/dri/i915tex/intel_context.h | 9
src/mesa/drivers/dri/i915tex/intel_mipmap_tree.c | 59
src/mesa/drivers/dri/i915tex/intel_mipmap_tree.h | 10
src/mesa/drivers/dri/i915tex/intel_render.c | 2
src/mesa/drivers/dri/i915tex/intel_screen.c | 9
src/mesa/drivers/dri/i915tex/intel_screen.h | 1
src/mesa/drivers/dri/i915tex/intel_tex.h | 3
src/mesa/drivers/dri/i915tex/intel_tex_image.c | 24
src/mesa/drivers/dri/i915tex/intel_tris.c | 3
src/mesa/drivers/dri/i965/Makefile | 1
src/mesa/drivers/dri/i965/brw_aub.c | 16
src/mesa/drivers/dri/i965/brw_aub_playback.c | 7
src/mesa/drivers/dri/i965/brw_cc.c | 7
src/mesa/drivers/dri/i965/brw_clip.c | 6
src/mesa/drivers/dri/i965/brw_clip.h | 4
src/mesa/drivers/dri/i965/brw_clip_state.c | 7
src/mesa/drivers/dri/i965/brw_clip_tri.c | 2
src/mesa/drivers/dri/i965/brw_clip_unfilled.c | 4
src/mesa/drivers/dri/i965/brw_clip_util.c | 16
src/mesa/drivers/dri/i965/brw_context.c | 11
src/mesa/drivers/dri/i965/brw_curbe.c | 4
src/mesa/drivers/dri/i965/brw_defines.h | 18
src/mesa/drivers/dri/i965/brw_draw.c | 6
src/mesa/drivers/dri/i965/brw_draw_upload.c | 27
src/mesa/drivers/dri/i965/brw_eu.c | 3
src/mesa/drivers/dri/i965/brw_eu.h | 29
src/mesa/drivers/dri/i965/brw_eu_emit.c | 77
src/mesa/drivers/dri/i965/brw_gs.c | 2
src/mesa/drivers/dri/i965/brw_gs.h | 4
src/mesa/drivers/dri/i965/brw_gs_state.c | 3
src/mesa/drivers/dri/i965/brw_metaops.c | 2
src/mesa/drivers/dri/i965/brw_misc_state.c | 33
src/mesa/drivers/dri/i965/brw_program.c | 3
src/mesa/drivers/dri/i965/brw_sf.c | 21
src/mesa/drivers/dri/i965/brw_sf.h | 17
src/mesa/drivers/dri/i965/brw_sf_emit.c | 140
src/mesa/drivers/dri/i965/brw_sf_state.c | 14
src/mesa/drivers/dri/i965/brw_state.h | 1
src/mesa/drivers/dri/i965/brw_state_batch.c | 1
src/mesa/drivers/dri/i965/brw_state_cache.c | 2
src/mesa/drivers/dri/i965/brw_state_pool.c | 5
src/mesa/drivers/dri/i965/brw_state_upload.c | 2
src/mesa/drivers/dri/i965/brw_structs.h | 105
src/mesa/drivers/dri/i965/brw_tex.c | 31
src/mesa/drivers/dri/i965/brw_tex_layout.c | 50
src/mesa/drivers/dri/i965/brw_urb.c | 10
src/mesa/drivers/dri/i965/brw_vs.c | 2
src/mesa/drivers/dri/i965/brw_vs.h | 6
src/mesa/drivers/dri/i965/brw_vs_emit.c | 254
src/mesa/drivers/dri/i965/brw_vs_state.c | 2
src/mesa/drivers/dri/i965/brw_vs_tnl.c | 30
src/mesa/drivers/dri/i965/brw_wm.c | 120
src/mesa/drivers/dri/i965/brw_wm.h | 17
src/mesa/drivers/dri/i965/brw_wm_emit.c | 161
src/mesa/drivers/dri/i965/brw_wm_fp.c | 175
src/mesa/drivers/dri/i965/brw_wm_glsl.c | 1370 +++
src/mesa/drivers/dri/i965/brw_wm_pass0.c | 4
src/mesa/drivers/dri/i965/brw_wm_pass1.c | 7
src/mesa/drivers/dri/i965/brw_wm_pass2.c | 2
src/mesa/drivers/dri/i965/brw_wm_sampler_state.c | 10
src/mesa/drivers/dri/i965/brw_wm_state.c | 13
src/mesa/drivers/dri/i965/brw_wm_surface_state.c | 31
src/mesa/drivers/dri/i965/bufmgr_fake.c | 5
src/mesa/drivers/dri/i965/intel_batchbuffer.c | 4
src/mesa/drivers/dri/i965/intel_batchbuffer.h | 2
src/mesa/drivers/dri/i965/intel_blit.c | 5
src/mesa/drivers/dri/i965/intel_buffers.c | 41
src/mesa/drivers/dri/i965/intel_context.c | 54
src/mesa/drivers/dri/i965/intel_context.h | 14
src/mesa/drivers/dri/i965/intel_mipmap_tree.c | 44
src/mesa/drivers/dri/i965/intel_mipmap_tree.h | 7
src/mesa/drivers/dri/i965/intel_pixel_bitmap.c | 47
src/mesa/drivers/dri/i965/intel_pixel_copy.c | 5
src/mesa/drivers/dri/i965/intel_screen.c | 2
src/mesa/drivers/dri/i965/intel_state.c | 25
src/mesa/drivers/dri/i965/intel_tex_validate.c | 36
src/mesa/drivers/dri/i965/server/i830_common.h | 10
src/mesa/drivers/dri/intel/intel_tex_layout.c | 46
src/mesa/drivers/dri/intel/intel_tex_layout.h | 3
src/mesa/drivers/dri/mga/mgarender.c | 2
src/mesa/drivers/dri/r200/r200_context.c | 2
src/mesa/drivers/dri/r200/r200_context.h | 1
src/mesa/drivers/dri/r200/r200_tcl.c | 2
src/mesa/drivers/dri/r200/r200_tex.h | 4
src/mesa/drivers/dri/r200/r200_texmem.c | 5
src/mesa/drivers/dri/r200/r200_texstate.c | 107
src/mesa/drivers/dri/r200/r200_vertprog.c | 16
src/mesa/drivers/dri/r300/r300_cmdbuf.c | 13
src/mesa/drivers/dri/r300/r300_context.c | 2
src/mesa/drivers/dri/r300/r300_context.h | 12
src/mesa/drivers/dri/r300/r300_ioctl.c | 4
src/mesa/drivers/dri/r300/r300_reg.h | 21
src/mesa/drivers/dri/r300/r300_state.c | 63
src/mesa/drivers/dri/r300/r300_tex.h | 4
src/mesa/drivers/dri/r300/r300_texmem.c | 3
src/mesa/drivers/dri/r300/r300_texstate.c | 73
src/mesa/drivers/dri/radeon/radeon_chipset.h | 1
src/mesa/drivers/dri/radeon/radeon_screen.c | 31
src/mesa/drivers/dri/radeon/radeon_tcl.c | 2
src/mesa/drivers/dri/s3v/s3v_render.c | 2
src/mesa/drivers/dri/savage/savagerender.c | 2
src/mesa/drivers/dri/sis/sis_tex.c | 4
src/mesa/drivers/dri/unichrome/via_context.c | 9
src/mesa/drivers/dri/unichrome/via_render.c | 2
src/mesa/drivers/dri/unichrome/via_tris.c | 27
src/mesa/drivers/fbdev/glfbdev.c | 5
src/mesa/drivers/glide/fxddspan.c | 3
src/mesa/drivers/glide/fxddtex.c | 4
src/mesa/drivers/glide/fxg.c | 14
src/mesa/drivers/glide/fxsetup.c | 3
src/mesa/drivers/glide/fxtris.c | 17
src/mesa/drivers/glide/fxvbtmp.h | 5
src/mesa/drivers/windows/gdi/wgl.c | 16
src/mesa/drivers/windows/gdi/wmesa.c | 100
src/mesa/drivers/x11/fakeglx.c | 9
src/mesa/drivers/x11/xm_dd.c | 257
src/mesa/drivers/x11/xm_glide.c | 3
src/mesa/gl.pc.in | 11
src/mesa/glapi/EXT_framebuffer_object.xml | 18
src/mesa/glapi/Makefile | 119
src/mesa/glapi/dispatch.h | 17
src/mesa/glapi/gl_API.xml | 47
src/mesa/glapi/glapioffsets.h | 12
src/mesa/glapi/glapitable.h | 11
src/mesa/glapi/glapitemp.h | 33
src/mesa/glapi/glprocs.h | 562 -
src/mesa/main/api_validate.c | 150
src/mesa/main/attrib.c | 203
src/mesa/main/attrib.h | 4
src/mesa/main/buffers.c | 16
src/mesa/main/config.h | 2
src/mesa/main/context.c | 136
src/mesa/main/context.h | 8
src/mesa/main/dd.h | 5
src/mesa/main/depthstencil.c | 2
src/mesa/main/dlist.c | 61
src/mesa/main/drawpix.c | 15
src/mesa/main/enable.c | 17
src/mesa/main/enums.c | 1208 +--
src/mesa/main/fbobject.c | 29
src/mesa/main/framebuffer.c | 13
src/mesa/main/get.c | 12
src/mesa/main/get_gen.py | 5
src/mesa/main/glheader.h | 2
src/mesa/main/image.c | 31
src/mesa/main/imports.c | 21
src/mesa/main/imports.h | 6
src/mesa/main/light.c | 9
src/mesa/main/lines.c | 5
src/mesa/main/mm.c | 8
src/mesa/main/mm.h | 5
src/mesa/main/mtypes.h | 17
src/mesa/main/points.c | 26
src/mesa/main/polygon.c | 5
src/mesa/main/state.c | 45
src/mesa/main/stencil.c | 295
src/mesa/main/stencil.h | 7
src/mesa/main/texcompress_s3tc.c | 26
src/mesa/main/texenvprogram.c | 24
src/mesa/main/texformat.h | 2
src/mesa/main/teximage.c | 11
src/mesa/main/texobj.c | 223
src/mesa/main/texobj.h | 4
src/mesa/main/texstate.c | 100
src/mesa/main/texstore.c | 7
src/mesa/main/varray.c | 3
src/mesa/main/version.h | 8
src/mesa/shader/arbprogparse.c | 127
src/mesa/shader/arbprogram.c | 4
src/mesa/shader/arbprogram.syn | 10
src/mesa/shader/arbprogram_syn.h | 8
src/mesa/shader/atifragshader.c | 4
src/mesa/shader/prog_execute.c | 131
src/mesa/shader/prog_execute.h | 3
src/mesa/shader/prog_parameter.c | 5
src/mesa/shader/prog_statevars.c | 101
src/mesa/shader/prog_statevars.h | 8
src/mesa/shader/program.c | 3
src/mesa/shader/shader_api.c | 233
src/mesa/shader/slang/library/slang_common_builtin.gc | 1
src/mesa/shader/slang/library/slang_common_builtin_gc.h | 83
src/mesa/shader/slang/slang_builtin.c | 16
src/mesa/shader/slang/slang_codegen.c | 7
src/mesa/shader/slang/slang_emit.c | 30
src/mesa/shader/slang/slang_link.c | 7
src/mesa/shader/slang/slang_preprocess.c | 4
src/mesa/sources | 3
src/mesa/sparc/glapi_sparc.S | 2
src/mesa/swrast/s_aalinetemp.h | 1
src/mesa/swrast/s_aatriangle.c | 16
src/mesa/swrast/s_aatritemp.h | 41
src/mesa/swrast/s_context.c | 29
src/mesa/swrast/s_context.h | 5
src/mesa/swrast/s_copypix.c | 11
src/mesa/swrast/s_drawpix.c | 8
src/mesa/swrast/s_fragprog.c | 32
src/mesa/swrast/s_linetemp.h | 3
src/mesa/swrast/s_pointtemp.h | 9
src/mesa/swrast/s_readpix.c | 16
src/mesa/swrast/s_span.c | 7
src/mesa/swrast/s_texfilter.c | 35
src/mesa/swrast/s_triangle.c | 2
src/mesa/swrast/s_tritemp.h | 11
src/mesa/swrast/s_zoom.c | 33
src/mesa/swrast/swrast.h | 7
src/mesa/swrast_setup/ss_context.c | 3
src/mesa/swrast_setup/ss_triangle.c | 14
src/mesa/swrast_setup/ss_tritmp.h | 20
src/mesa/tnl/t_draw.c | 7
src/mesa/tnl/t_vb_fog.c | 43
src/mesa/tnl/t_vb_program.c | 340
src/mesa/tnl/t_vertex_sse.c | 18
src/mesa/tnl/t_vp_build.c | 71
src/mesa/tnl/tnl.h | 8
src/mesa/tnl_dd/t_dd_tritmp.h | 8
src/mesa/vbo/vbo_context.c | 1
src/mesa/vbo/vbo_exec.h | 3
src/mesa/vbo/vbo_exec_api.c | 31
src/mesa/vbo/vbo_exec_array.c | 15
src/mesa/vbo/vbo_exec_draw.c | 2
src/mesa/vbo/vbo_save.c | 15
src/mesa/vbo/vbo_save_api.c | 3
src/mesa/vbo/vbo_save_draw.c | 10
src/mesa/vbo/vbo_split_copy.c | 9
src/mesa/x86-64/glapi_x86-64.S | 46
src/mesa/x86-64/xform4.S | 10
src/mesa/x86/Makefile | 2
src/mesa/x86/common_x86.c | 4
src/mesa/x86/glapi_x86.S | 13
src/mesa/x86/read_rgba_span_x86.S | 137
src/mesa/x86/rtasm/x86sse.c | 226
src/mesa/x86/rtasm/x86sse.h | 62
windows/VC6/progs/glut/glut.dsp | 2
windows/VC7/mesa/gdi/gdi.vcproj | 376
windows/VC7/mesa/glu/glu.vcproj | 66
windows/VC7/mesa/mesa.sln | 20
windows/VC7/mesa/mesa/mesa.vcproj | 294
windows/VC7/mesa/osmesa/osmesa.vcproj | 18
windows/VC7/progs/glut/glut.vcproj | 2
windows/VC8/mesa/mesa.sln | 3
windows/VC8/progs/glut/glut.vcproj | 2
439 files changed, 27259 insertions(+), 4293 deletions(-)
New commits:
commit 2ac4919d24ad931eadc538add0a3fa353aa3aa10
Author: Xiang, Haihao <haihao.xiang@intel.com>
Date: Wed Jun 18 15:48:45 2008 +0800
i965: add support for Intel 4 series chipsets
diff --git a/src/mesa/drivers/dri/i965/brw_defines.h b/src/mesa/drivers/dri/i965/brw_defines.h
index d60d6c2..3b0e0f6 100644
--- a/src/mesa/drivers/dri/i965/brw_defines.h
+++ b/src/mesa/drivers/dri/i965/brw_defines.h
@@ -850,7 +850,11 @@
#define R02_PRIM_END 0x1
#define R02_PRIM_START 0x2
-#define BRW_IS_IGD(brw) ((brw)->intel.intelScreen->deviceID == PCI_CHIP_IGD_GM)
+#define BRW_IS_IGD_GM(brw) ((brw)->intel.intelScreen->deviceID == PCI_CHIP_IGD_GM)
+#define BRW_IS_G4X(brw) (((brw)->intel.intelScreen->deviceID == PCI_CHIP_IGD_E_G) || \
+ ((brw)->intel.intelScreen->deviceID == PCI_CHIP_G45_G) || \
+ ((brw)->intel.intelScreen->deviceID == PCI_CHIP_Q45_G))
+#define BRW_IS_IGD(brw) (BRW_IS_IGD_GM(brw) || BRW_IS_G4X(brw))
#define CMD_PIPELINE_SELECT(brw) ((BRW_IS_IGD(brw)) ? CMD_PIPELINE_SELECT_IGD : CMD_PIPELINE_SELECT_965)
#define CMD_VF_STATISTICS(brw) ((BRW_IS_IGD(brw)) ? CMD_VF_STATISTICS_IGD : CMD_VF_STATISTICS_965)
#define URB_SIZES(brw) ((BRW_IS_IGD(brw)) ? 384 : 256) /* 512 bit unit */
diff --git a/src/mesa/drivers/dri/i965/intel_context.c b/src/mesa/drivers/dri/i965/intel_context.c
index 8591e5c..bcaf3a1 100644
--- a/src/mesa/drivers/dri/i965/intel_context.c
+++ b/src/mesa/drivers/dri/i965/intel_context.c
@@ -127,8 +127,14 @@ static const GLubyte *intelGetString( GLcontext *ctx, GLenum name )
chipset = "Intel(R) 965GM"; break;
break;
case PCI_CHIP_IGD_GM:
+ case PCI_CHIP_IGD_E_G:
chipset = "Intel(R) Integrated Graphics Device";
break;
+ case PCI_CHIP_Q45_G:
+ chipset = "Intel(R) Q45/Q43"; break;
+ case PCI_CHIP_G45_G:
+ chipset = "Intel(R) G45/G43"; break;
+
default:
chipset = "Unknown Intel Chipset"; break;
}
diff --git a/src/mesa/drivers/dri/i965/intel_context.h b/src/mesa/drivers/dri/i965/intel_context.h
index a588514..9986fd7 100644
--- a/src/mesa/drivers/dri/i965/intel_context.h
+++ b/src/mesa/drivers/dri/i965/intel_context.h
@@ -385,8 +385,11 @@ extern int INTEL_DEBUG;
#define PCI_CHIP_I946_GZ 0x2972
#define PCI_CHIP_I965_GM 0x2A02
-#define PCI_CHIP_IGD_GM 0x2A42
+#define PCI_CHIP_IGD_GM 0x2A42
+#define PCI_CHIP_IGD_E_G 0x2E02
+#define PCI_CHIP_Q45_G 0x2E12
+#define PCI_CHIP_G45_G 0x2E22
/* ================================================================
* intel_context.c:
commit 3ed89025f3df9e72afe0a77c847aab13b2ee861b
Author: Xiang, Haihao <haihao.xiang@intel.com>
Date: Wed Jun 18 13:46:55 2008 +0800
i915: The pitch passed to intelEmitCopyBlitLocked should be in pixels,
not in bytes. Reported by Christopher Dissauer.
diff --git a/src/mesa/drivers/dri/i915/intel_pixel.c b/src/mesa/drivers/dri/i915/intel_pixel.c
index 31ed5cf..c5005ba 100644
--- a/src/mesa/drivers/dri/i915/intel_pixel.c
+++ b/src/mesa/drivers/dri/i915/intel_pixel.c
@@ -228,7 +228,7 @@ intelTryReadPixels( GLcontext *ctx,
__DRIdrawablePrivate *dPriv = intel->driDrawable;
int nbox = dPriv->numClipRects;
int src_offset = intel->readRegion->offset;
- int src_pitch = intel->intelScreen->front.pitch;
+ int src_pitch = intel->intelScreen->front.pitch / intel->intelScreen->cpp; /* in pixels */
int dst_offset = intelAgpOffsetFromVirtual( intel, pixels);
drm_clip_rect_t *box = dPriv->pClipRects;
int i;
@@ -308,7 +308,7 @@ static void do_draw_pix( GLcontext *ctx,
int nbox = dPriv->numClipRects;
int i;
int src_offset = intelAgpOffsetFromVirtual( intel, pixels);
- int src_pitch = pitch;
+ int src_pitch = pitch; /* in pixels */
assert(src_offset != ~0); /* should be caught earlier */
@@ -339,7 +339,7 @@ static void do_draw_pix( GLcontext *ctx,
intelEmitCopyBlitLocked( intel,
intel->intelScreen->cpp,
src_pitch, src_offset,
- intel->intelScreen->front.pitch,
+ intel->intelScreen->front.pitch / intel->intelScreen->cpp, /* in pixels */
intel->drawRegion->offset,
bx - x, by - y,
bx, by,
commit 5b42bbce70ea093ee9a0e8fa7a0d42ddc4143832
Author: Xiang, Haihao <haihao.xiang@intel.com>
Date: Wed Jun 18 13:38:53 2008 +0800
i915: fix data size in intelTryDrawPixels. Reported by Christopher Dissauer
diff --git a/src/mesa/drivers/dri/i915/intel_pixel.c b/src/mesa/drivers/dri/i915/intel_pixel.c
index 535cbfc..31ed5cf 100644
--- a/src/mesa/drivers/dri/i915/intel_pixel.c
+++ b/src/mesa/drivers/dri/i915/intel_pixel.c
@@ -364,7 +364,7 @@ intelTryDrawPixels( GLcontext *ctx,
GLint pitch = unpack->RowLength ? unpack->RowLength : width;
GLuint dest;
GLuint cpp = intel->intelScreen->cpp;
- GLint size = width * pitch * cpp;
+ GLint size = height * pitch * cpp;
if (INTEL_DEBUG & DEBUG_PIXEL)
fprintf(stderr, "%s\n", __FUNCTION__);
commit d2e0a11aab98764300b9019483dc701117be3fea
Author: Brian Paul <brian.paul@tungstengraphics.com>
Date: Tue Jun 17 16:44:00 2008 -0600
mesa: fix inconsistent use of GL_UNSIGNED_INT vs. GL_UNSIGNED_INT_24_8_EXT for Z unpacking
diff --git a/src/mesa/main/image.c b/src/mesa/main/image.c
index d7a96f7..94ddebc 100644
--- a/src/mesa/main/image.c
+++ b/src/mesa/main/image.c
@@ -3963,7 +3963,7 @@ _mesa_unpack_depth_span( const GLcontext *ctx, GLuint n,
DEPTH_VALUES(GLuint, UINT_TO_FLOAT);
break;
case GL_UNSIGNED_INT_24_8_EXT: /* GL_EXT_packed_depth_stencil */
- if (dstType == GL_UNSIGNED_INT &&
+ if (dstType == GL_UNSIGNED_INT_24_8_EXT &&
depthScale == (GLfloat) 0xffffff &&
ctx->Pixel.DepthScale == 1.0 &&
ctx->Pixel.DepthBias == 0.0) {
diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c
index 2ac458b..ec97a01 100644
--- a/src/mesa/main/texstore.c
+++ b/src/mesa/main/texstore.c
@@ -2320,6 +2320,8 @@ _mesa_texstore_ycbcr(TEXSTORE_PARAMS)
GLboolean
_mesa_texstore_z24_s8(TEXSTORE_PARAMS)
{
+ const GLfloat depthScale = (GLfloat) 0xffffff;
+
ASSERT(dstFormat == &_mesa_texformat_z24_s8);
ASSERT(srcFormat == GL_DEPTH_STENCIL_EXT);
ASSERT(srcType == GL_UNSIGNED_INT_24_8_EXT);
@@ -2356,9 +2358,9 @@ _mesa_texstore_z24_s8(TEXSTORE_PARAMS)
GLint i;
/* the 24 depth bits will be in the high position: */
_mesa_unpack_depth_span(ctx, srcWidth,
- GL_UNSIGNED_INT, /* dst type */
+ GL_UNSIGNED_INT_24_8_EXT, /* dst type */
dstRow, /* dst addr */
- (GLfloat) 0xffffff, /* depthScale */
+ depthScale,
srcType, src, srcPacking);
/* get the 8-bit stencil values */
_mesa_unpack_stencil_span(ctx, srcWidth,
commit 47d046c93f7d6ea97feae193d201e74aebfd4394
Author: Brian Paul <brian.paul@tungstengraphics.com>
Date: Tue Jun 17 10:10:53 2008 -0600
mesa: make mm.c use unsigned ints for offsets.
If you have a GPU using this code and it has the offsets up in this space,
this fails.
cherry-picked from master
diff --git a/src/mesa/main/mm.c b/src/mesa/main/mm.c
index 846c329..fb7809e 100644
--- a/src/mesa/main/mm.c
+++ b/src/mesa/main/mm.c
@@ -53,7 +53,7 @@ mmDumpMemInfo(const struct mem_block *heap)
}
struct mem_block *
-mmInit(int ofs, int size)
+mmInit(unsigned int ofs, int size)
{
struct mem_block *heap, *block;
@@ -91,7 +91,7 @@ mmInit(int ofs, int size)
static struct mem_block *
SliceBlock(struct mem_block *p,
- int startofs, int size,
+ unsigned int startofs, int size,
int reserved, int alignment)
{
struct mem_block *newblock;
@@ -164,8 +164,8 @@ mmAllocMem(struct mem_block *heap, int size, int align2, int startSearch)
{
struct mem_block *p;
const int mask = (1 << align2)-1;
- int startofs = 0;
- int endofs;
+ unsigned int startofs = 0;
+ unsigned int endofs;
if (!heap || align2 < 0 || size <= 0)
return NULL;
diff --git a/src/mesa/main/mm.h b/src/mesa/main/mm.h
index 26d59ff..5ad3ffd 100644
--- a/src/mesa/main/mm.h
+++ b/src/mesa/main/mm.h
@@ -39,7 +39,8 @@ struct mem_block {
struct mem_block *next, *prev;
struct mem_block *next_free, *prev_free;
struct mem_block *heap;
- int ofs,size;
+ unsigned int ofs;
+ int size;
unsigned int free:1;
unsigned int reserved:1;
};
@@ -50,7 +51,7 @@ struct mem_block {
* input: total size in bytes
* return: a heap pointer if OK, NULL if error
*/
-extern struct mem_block *mmInit(int ofs, int size);
+extern struct mem_block *mmInit(unsigned int ofs, int size);
/**
* Allocate 'size' bytes with 2^align2 bytes alignment,
commit 718724deeb23099ee74ee3a3dc23d2447d004f02
Author: Wilfried Holzke <sf@holzke.net>
Date: Tue Jun 17 10:03:03 2008 -0600
assorted glide driver fixes/updates
diff --git a/src/mesa/Makefile b/src/mesa/Makefile
index d0c19f5..a4f7488 100644
--- a/src/mesa/Makefile
+++ b/src/mesa/Makefile
@@ -89,7 +89,8 @@ fbdev: $(CORE_OBJECTS) $(FBDEV_DRIVER_OBJECTS) $(COMMON_DRIVER_OBJECTS)
# Stand-alone Mesa libGL and libOSMesa
STAND_ALONE_DRIVER_SOURCES = \
$(COMMON_DRIVER_SOURCES) \
- $(X11_DRIVER_SOURCES)
+ $(X11_DRIVER_SOURCES) \
+ $(GLIDE_DRIVER_SOURCES)
STAND_ALONE_DRIVER_OBJECTS = $(STAND_ALONE_DRIVER_SOURCES:.c=.o)
diff --git a/src/mesa/drivers/glide/fxddspan.c b/src/mesa/drivers/glide/fxddspan.c
index 3ea9f73..a5b4e83 100644
--- a/src/mesa/drivers/glide/fxddspan.c
+++ b/src/mesa/drivers/glide/fxddspan.c
@@ -549,6 +549,7 @@ void
fxSetupDDSpanPointers(GLcontext * ctx)
{
struct swrast_device_driver *swdd = _swrast_GetDeviceDriverReference( ctx );
+#if 0
fxMesaContext fxMesa = FX_CONTEXT(ctx);
switch (fxMesa->colDepth) {
@@ -602,6 +603,8 @@ fxSetupDDSpanPointers(GLcontext * ctx)
swdd->WriteStencilPixels = fxWriteStencilPixels;
swdd->ReadStencilPixels = fxReadStencilPixels;
}
+#endif
+
#if 0
swdd->WriteCI8Span = NULL;
swdd->WriteCI32Span = NULL;
diff --git a/src/mesa/drivers/glide/fxddtex.c b/src/mesa/drivers/glide/fxddtex.c
index cb2c855..aed72ca 100644
--- a/src/mesa/drivers/glide/fxddtex.c
+++ b/src/mesa/drivers/glide/fxddtex.c
@@ -504,7 +504,7 @@ fxDDIsTextureResident(GLcontext *ctx, struct gl_texture_object *tObj)
static GrTexTable_t
convertPalette(const fxMesaContext fxMesa, FxU32 data[256], const struct gl_color_table *table)
{
- const GLubyte *tableUB = (const GLubyte *) table->Table;
+ const GLubyte *tableUB = (const GLubyte *) table->TableUB;
GLint width = table->Size;
FxU32 r, g, b, a;
GLint i;
@@ -580,7 +580,7 @@ fxDDTexPalette(GLcontext * ctx, struct gl_texture_object *tObj)
tObj->Name, (GLuint) tObj->DriverData);
}
/* This might be a proxy texture. */
- if (!tObj->Palette.Table)
+ if (!tObj->Palette.TableUB) /* TODO: is that ok or should it be TableF? */
return;
if (!tObj->DriverData)
tObj->DriverData = fxAllocTexObjData(fxMesa);
diff --git a/src/mesa/drivers/glide/fxg.c b/src/mesa/drivers/glide/fxg.c
index afb9441..dc0517b 100644
--- a/src/mesa/drivers/glide/fxg.c
+++ b/src/mesa/drivers/glide/fxg.c
@@ -2306,4 +2306,18 @@ void tdfx_hook_glide (struct tdfx_glide *Glide, int pointcast)
#undef GET_EXT_ADDR
}
+#else
+
+/*
+ * Need this to provide at least one external definition.
+ */
+
+extern int gl_fxg_dummy_function(void);
+int
+gl_fxg_dummy_function(void)
+{
+ return 0;
+}
+
+
#endif /* FX */
diff --git a/src/mesa/drivers/glide/fxsetup.c b/src/mesa/drivers/glide/fxsetup.c
index 240e5e0..8c004db 100644
--- a/src/mesa/drivers/glide/fxsetup.c
+++ b/src/mesa/drivers/glide/fxsetup.c
@@ -154,7 +154,8 @@ fxTexValidate(GLcontext * ctx, struct gl_texture_object *tObj)
}
}
- ti->baseLevelInternalFormat = tObj->Image[0][minl]->Format;
+ /* TODO: right format? */
+ ti->baseLevelInternalFormat = tObj->Image[0][minl]->_BaseFormat;
ti->validated = GL_TRUE;
diff --git a/src/mesa/drivers/glide/fxtris.c b/src/mesa/drivers/glide/fxtris.c
index 0b9b3be..6b219b4 100644
--- a/src/mesa/drivers/glide/fxtris.c
+++ b/src/mesa/drivers/glide/fxtris.c
@@ -177,22 +177,23 @@ fx_translate_vertex( GLcontext *ctx, const GrVertex *src, SWvertex *dst)
dst->specular[2] = src->g1;
#endif /* !FX_PACKEDCOLOR */
- dst->texcoord[ts0][0] = fxMesa->inv_s0scale * src->tmuvtx[0].sow * w;
- dst->texcoord[ts0][1] = fxMesa->inv_t0scale * src->tmuvtx[0].tow * w;
+ /* TODO: changed "texcoord" to "attrib" */
+ dst->attrib[ts0][0] = fxMesa->inv_s0scale * src->tmuvtx[0].sow * w;
+ dst->attrib[ts0][1] = fxMesa->inv_t0scale * src->tmuvtx[0].tow * w;
if (fxMesa->stw_hint_state & GR_STWHINT_W_DIFF_TMU0)
- dst->texcoord[ts0][3] = src->tmuvtx[0].oow * w;
+ dst->attrib[ts0][3] = src->tmuvtx[0].oow * w;
else
- dst->texcoord[ts0][3] = 1.0F;
+ dst->attrib[ts0][3] = 1.0F;
if (fxMesa->SetupIndex & SETUP_TMU1) {
- dst->texcoord[ts1][0] = fxMesa->inv_s1scale * src->tmuvtx[1].sow * w;
- dst->texcoord[ts1][1] = fxMesa->inv_t1scale * src->tmuvtx[1].tow * w;
+ dst->attrib[ts1][0] = fxMesa->inv_s1scale * src->tmuvtx[1].sow * w;
+ dst->attrib[ts1][1] = fxMesa->inv_t1scale * src->tmuvtx[1].tow * w;
if (fxMesa->stw_hint_state & GR_STWHINT_W_DIFF_TMU1)
- dst->texcoord[ts1][3] = src->tmuvtx[1].oow * w;
+ dst->attrib[ts1][3] = src->tmuvtx[1].oow * w;
else
- dst->texcoord[ts1][3] = 1.0F;
+ dst->attrib[ts1][3] = 1.0F;
}
dst->pointSize = src->psize;
diff --git a/src/mesa/drivers/glide/fxvbtmp.h b/src/mesa/drivers/glide/fxvbtmp.h
index f7970c7..c1bba27 100644
--- a/src/mesa/drivers/glide/fxvbtmp.h
+++ b/src/mesa/drivers/glide/fxvbtmp.h
@@ -57,8 +57,13 @@ static void TAG(emit)( GLcontext *ctx,
int i;
if (IND & SETUP_PSIZ) {
+ /*
psize = VB->PointSizePtr->data;
psize_stride = VB->PointSizePtr->stride;
+ */
+ /* TODO: fix this! */
+ psize = 0;
+ psize_stride = 0;
}
if (IND & SETUP_TMU0) {
diff --git a/src/mesa/drivers/x11/xm_glide.c b/src/mesa/drivers/x11/xm_glide.c
index ae4f428..cbd69b0 100644
--- a/src/mesa/drivers/x11/xm_glide.c
+++ b/src/mesa/drivers/x11/xm_glide.c
@@ -64,7 +64,8 @@ FXcreateContext(XMesaVisual v, XMesaWindow w, XMesaContext c, XMesaBuffer b)
attribs[numAttribs++] = FXMESA_NONE;
/* [dBorca] we should take an envvar for `fxMesaSelectCurrentBoard'!!! */
- hw = fxMesaSelectCurrentBoard(0);
+/* hw = fxMesaSelectCurrentBoard(0); */
+ hw = GR_SSTTYPE_Voodoo2;
/* if these fail, there's a new bug somewhere */
ASSERT(b->mesa_buffer.Width > 0);
diff --git a/src/mesa/sources b/src/mesa/sources
index dbfc01d..8456204 100644
--- a/src/mesa/sources
+++ b/src/mesa/sources
@@ -258,7 +258,6 @@ OSMESA_DRIVER_SOURCES = \
GLIDE_DRIVER_SOURCES = \
drivers/glide/fxapi.c \
drivers/glide/fxdd.c \
- drivers/glide/fxddspan.c \
drivers/glide/fxddtex.c \
drivers/glide/fxsetup.c \
drivers/glide/fxtexman.c \
@@ -267,6 +266,8 @@ GLIDE_DRIVER_SOURCES = \
drivers/glide/fxglidew.c \
drivers/glide/fxg.c
+# drivers/fxddspan.c
+
SVGA_DRIVER_SOURCES = \
drivers/svga/svgamesa.c \
drivers/svga/svgamesa8.c \
commit 85c325c36c3832c08a5320a66e6bff107ed66cd3
Author: Brian Paul <brian.paul@tungstengraphics.com>
Date: Tue Jun 17 10:02:10 2008 -0600
add hyphen to rm command
diff --git a/src/mesa/x86/Makefile b/src/mesa/x86/Makefile
index 3c6a6b1..dc8c7f3 100644
--- a/src/mesa/x86/Makefile
+++ b/src/mesa/x86/Makefile
@@ -17,7 +17,7 @@ INCLUDE_DIRS = \
default: gen_matypes matypes.h
clean:
- rm -f matypes.h gen_matypes
+ -rm -f matypes.h gen_matypes
gen_matypes: gen_matypes.c
commit 7e6d99f5ecd9225257c77df36cbac21661fa3930
Author: Brian Paul <brian.paul@tungstengraphics.com>
Date: Tue Jun 17 09:01:40 2008 -0600
glu: silence warnings
diff --git a/src/glu/sgi/libutil/quad.c b/src/glu/sgi/libutil/quad.c
index e604539..1ae7442 100644
--- a/src/glu/sgi/libutil/quad.c
+++ b/src/glu/sgi/libutil/quad.c
@@ -713,8 +713,8 @@ gluSphere(GLUquadric *qobj, GLdouble radius, GLint slices, GLint stacks)
GLfloat cosCache3b[CACHE_SIZE];
GLfloat angle;
GLfloat zLow, zHigh;
- GLfloat sintemp1, sintemp2, sintemp3 = 0.0, sintemp4 = 0.0;
- GLfloat costemp1, costemp2 = 0.0, costemp3 = 0.0, costemp4 = 0.0;
+ GLfloat sintemp1 = 0.0, sintemp2 = 0.0, sintemp3 = 0.0, sintemp4 = 0.0;
+ GLfloat costemp1 = 0.0, costemp2 = 0.0, costemp3 = 0.0, costemp4 = 0.0;
GLboolean needCache2, needCache3;
GLint start, finish;
commit 6ce6dc961b3fcb8b687d79565adf793d81aac37d
Author: Brian Paul <brian.paul@tungstengraphics.com>
Date: Mon Jun 16 10:18:53 2008 -0600
bump version to 7.0.4
diff --git a/Makefile b/Makefile
index a010e42..9d3c8f2 100644
--- a/Makefile
+++ b/Makefile
@@ -172,10 +172,10 @@ ultrix-gcc:
# Rules for making release tarballs
-DIRECTORY = Mesa-7.0.3
-LIB_NAME = MesaLib-7.0.3
-DEMO_NAME = MesaDemos-7.0.3
-GLUT_NAME = MesaGLUT-7.0.3
+DIRECTORY = Mesa-7.0.4
+LIB_NAME = MesaLib-7.0.4
+DEMO_NAME = MesaDemos-7.0.4
+GLUT_NAME = MesaGLUT-7.0.4
MAIN_FILES = \
$(DIRECTORY)/Makefile* \
diff --git a/configs/default b/configs/default
index eb2eb8b..1badafd 100644
--- a/configs/default
+++ b/configs/default
@@ -10,7 +10,7 @@ CONFIG_NAME = default
# Version info
MESA_MAJOR=7
MESA_MINOR=0
-MESA_TINY=3
+MESA_TINY=4
# external projects. This should be useless now that we use libdrm.
DRM_SOURCE_PATH=$(TOP)/../drm
diff --git a/src/mesa/main/version.h b/src/mesa/main/version.h
index 0bf7557..5017198 100644
--- a/src/mesa/main/version.h
+++ b/src/mesa/main/version.h
@@ -1,6 +1,6 @@
/*
* Mesa 3-D graphics library
- * Version: 7.0.3
+ * Version: 7.0.4
*
* Copyright (C) 1999-2008 Brian Paul All Rights Reserved.
*
@@ -30,8 +30,8 @@
/* Mesa version */
#define MESA_MAJOR 7
#define MESA_MINOR 0
-#define MESA_PATCH 3
-#define MESA_VERSION_STRING "7.0.3"
+#define MESA_PATCH 4
+#define MESA_VERSION_STRING "7.0.4"
/* To make version comparison easy */
#define MESA_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
commit 186883611edfd867f7ebafd06aa61ac575bec0f8
Author: Brian Paul <brian.paul@tungstengraphics.com>
Date: Mon Jun 16 10:18:02 2008 -0600
fix glPixelZoom stack over flow on Windows
diff --git a/docs/relnotes-7.0.4.html b/docs/relnotes-7.0.4.html
index 2004d01..1ea2306 100644
--- a/docs/relnotes-7.0.4.html
+++ b/docs/relnotes-7.0.4.html
@@ -28,6 +28,7 @@ Mesa 7.0.4 is a stable release with bug fixes since version 7.0.3.
<li>Fixed potential crash in AA/smoothed triangle rendering when using a fragment shader
<li>Fixed glDrawElement + VBO segfault (bug 16156)
<li>Fixed GLSL linker bug causing generic vertex attributes to get aliased
+<li>Fixed stack overflow when using glPixelZoom on Windows
</ul>
<h2>Changes</h2>
commit 48b3c59cb93a430f7254b58d33eb5c01782ca836
Author: Brian Paul <brian.paul@tungstengraphics.com>
Date: Mon Jun 16 10:17:17 2008 -0600
mesa: allocate pixel zoom arrays on heap, not stack
Fixes stack overflow on Windows.
cherry-picked from master
diff --git a/src/mesa/swrast/s_context.c b/src/mesa/swrast/s_context.c
index 9b9b73f..af84ff6 100644
--- a/src/mesa/swrast/s_context.c
Reply to: