mesa: Changes to 'ubuntu'
ChangeLog |228264 ----
Makefile | 10
configs/autoconf.in | 7
configs/darwin | 7
configs/default | 4
configs/linux-osmesa | 6
configs/linux-osmesa16 | 2
configs/linux-osmesa32 | 2
configure.ac | 40
debian/changelog | 96
debian/control | 4
debian/copyright | 3
debian/patches/03_optional-progs-and-install.patch | 20
debian/patches/04_osmesa_version.diff | 8
debian/patches/05_hurd-ftbfs.diff | 16
debian/patches/06_kfreebsd-ftbfs.diff | 8
debian/patches/07-nouveau-update.diff | 32
debian/patches/08-kfreebsd-gallium.diff | 26
debian/patches/09-intel-fix-invalidate-before-initialisation.diff | 73
debian/patches/series | 2
debian/rules | 69
debian/scripts/choose-configs | 11
debian/watch | 7
dev/null |binary
docs/devinfo.html | 9
docs/lists.html | 9
docs/news.html | 8
docs/relnotes-7.8.2.html | 108
include/GL/glext.h | 3806
include/GL/glxext.h | 4
progs/demos/rain.cxx | 2
progs/egl/Makefile | 8
progs/fpglsl/.gitignore | 1
progs/fpglsl/Makefile | 52
progs/fpglsl/SConscript | 13
progs/fpglsl/fp-tri.c | 415
progs/fpglsl/mov-imm.glsl | 3
progs/fpglsl/mov.glsl | 3
progs/fpglsl/tex-multi.glsl | 15
progs/fpglsl/tex.glsl | 6
progs/gallium/python/retrace/README | 17
progs/gallium/python/retrace/format.py | 173
progs/gallium/python/retrace/interpreter.py | 763
progs/gallium/python/retrace/model.py | 213
progs/gallium/python/retrace/parse.py | 392
progs/gallium/python/retrace/parser.py | 34
progs/gallium/python/samples/gs.py | 254
progs/gallium/python/samples/tri.py | 232
progs/gallium/python/tests/.gitignore | 3
progs/gallium/python/tests/base.py | 344
progs/gallium/python/tests/regress/fragment-shader/.gitignore | 1
progs/gallium/python/tests/regress/fragment-shader/frag-abs.sh | 13
progs/gallium/python/tests/regress/fragment-shader/frag-add.sh | 8
progs/gallium/python/tests/regress/fragment-shader/frag-cb-1d.sh | 13
progs/gallium/python/tests/regress/fragment-shader/frag-cb-2d.sh | 9
progs/gallium/python/tests/regress/fragment-shader/frag-dp3.sh | 8
progs/gallium/python/tests/regress/fragment-shader/frag-dp4.sh | 8
progs/gallium/python/tests/regress/fragment-shader/frag-dst.sh | 8
progs/gallium/python/tests/regress/fragment-shader/frag-ex2.sh | 11
progs/gallium/python/tests/regress/fragment-shader/frag-flr.sh | 15
progs/gallium/python/tests/regress/fragment-shader/frag-frc.sh | 13
progs/gallium/python/tests/regress/fragment-shader/frag-lg2.sh | 15
progs/gallium/python/tests/regress/fragment-shader/frag-lit.sh | 8
progs/gallium/python/tests/regress/fragment-shader/frag-lrp.sh | 11
progs/gallium/python/tests/regress/fragment-shader/frag-mad.sh | 11
progs/gallium/python/tests/regress/fragment-shader/frag-max.sh | 10
progs/gallium/python/tests/regress/fragment-shader/frag-min.sh | 10
progs/gallium/python/tests/regress/fragment-shader/frag-mov.sh | 8
progs/gallium/python/tests/regress/fragment-shader/frag-mul.sh | 10
progs/gallium/python/tests/regress/fragment-shader/frag-rcp.sh | 15
progs/gallium/python/tests/regress/fragment-shader/frag-rsq.sh | 15
progs/gallium/python/tests/regress/fragment-shader/frag-sge.sh | 13
progs/gallium/python/tests/regress/fragment-shader/frag-slt.sh | 13
progs/gallium/python/tests/regress/fragment-shader/frag-srcmod-abs.sh | 13
progs/gallium/python/tests/regress/fragment-shader/frag-srcmod-absneg.sh | 15
progs/gallium/python/tests/regress/fragment-shader/frag-srcmod-neg.sh | 11
progs/gallium/python/tests/regress/fragment-shader/frag-srcmod-swz.sh | 8
progs/gallium/python/tests/regress/fragment-shader/frag-sub.sh | 8
progs/gallium/python/tests/regress/fragment-shader/frag-xpd.sh | 8
progs/gallium/python/tests/regress/fragment-shader/fragment-shader.py | 257
progs/gallium/python/tests/regress/vertex-shader/.gitignore | 1
progs/gallium/python/tests/regress/vertex-shader/vert-abs.sh | 15
progs/gallium/python/tests/regress/vertex-shader/vert-add.sh | 13
progs/gallium/python/tests/regress/vertex-shader/vert-arl.sh | 23
progs/gallium/python/tests/regress/vertex-shader/vert-arr.sh | 23
progs/gallium/python/tests/regress/vertex-shader/vert-cb-1d.sh | 16
progs/gallium/python/tests/regress/vertex-shader/vert-cb-2d.sh | 12
progs/gallium/python/tests/regress/vertex-shader/vert-dp3.sh | 16
progs/gallium/python/tests/regress/vertex-shader/vert-dp4.sh | 16
progs/gallium/python/tests/regress/vertex-shader/vert-dst.sh | 11
progs/gallium/python/tests/regress/vertex-shader/vert-ex2.sh | 18
progs/gallium/python/tests/regress/vertex-shader/vert-flr.sh | 23
progs/gallium/python/tests/regress/vertex-shader/vert-frc.sh | 15
progs/gallium/python/tests/regress/vertex-shader/vert-lg2.sh | 18
progs/gallium/python/tests/regress/vertex-shader/vert-lit.sh | 11
progs/gallium/python/tests/regress/vertex-shader/vert-lrp.sh | 14
progs/gallium/python/tests/regress/vertex-shader/vert-mad.sh | 14
progs/gallium/python/tests/regress/vertex-shader/vert-max.sh | 13
progs/gallium/python/tests/regress/vertex-shader/vert-min.sh | 13
progs/gallium/python/tests/regress/vertex-shader/vert-mov.sh | 11
progs/gallium/python/tests/regress/vertex-shader/vert-mul.sh | 13
progs/gallium/python/tests/regress/vertex-shader/vert-rcp.sh | 18
progs/gallium/python/tests/regress/vertex-shader/vert-rsq.sh | 18
progs/gallium/python/tests/regress/vertex-shader/vert-sge.sh | 16
progs/gallium/python/tests/regress/vertex-shader/vert-slt.sh | 16
progs/gallium/python/tests/regress/vertex-shader/vert-srcmod-abs.sh | 15
progs/gallium/python/tests/regress/vertex-shader/vert-srcmod-absneg.sh | 16
progs/gallium/python/tests/regress/vertex-shader/vert-srcmod-neg.sh | 12
progs/gallium/python/tests/regress/vertex-shader/vert-srcmod-swz.sh | 11
progs/gallium/python/tests/regress/vertex-shader/vert-sub.sh | 13
progs/gallium/python/tests/regress/vertex-shader/vert-xpd.sh | 11
progs/gallium/python/tests/regress/vertex-shader/vertex-shader.py | 287
progs/gallium/python/tests/surface_copy.py | 200
progs/gallium/python/tests/texture_render.py | 320
progs/gallium/python/tests/texture_sample.py | 591
progs/gallium/python/tests/texture_transfer.py | 180
progs/gallium/python/tests/tree.py | 23
progs/gallium/unit/SConscript | 20
progs/gallium/unit/u_format_test.c | 758
progs/glsl/.gitignore | 33
progs/glsl/CH06-brick.frag | 36
progs/glsl/CH06-brick.vert | 41
progs/glsl/CH11-bumpmap.frag | 41
progs/glsl/CH11-bumpmap.vert | 38
progs/glsl/CH11-bumpmaptex.frag | 47
progs/glsl/CH11-toyball.frag | 75
progs/glsl/CH11-toyball.vert | 24
progs/glsl/CH18-mandel.frag | 55
progs/glsl/CH18-mandel.vert | 35
progs/glsl/Makefile | 102
progs/glsl/SConscript | 37
progs/glsl/array.c | 258
progs/glsl/bitmap.c | 320
progs/glsl/brick.c | 200
progs/glsl/brick.shtest | 8
progs/glsl/bump.c | 347
progs/glsl/convolution.frag | 21
progs/glsl/convolution.vert | 5
progs/glsl/convolutions.c | 470
progs/glsl/cubemap.frag | 18
progs/glsl/deriv.c | 249
progs/glsl/fragcoord.c | 181
progs/glsl/identity.c | 204
progs/glsl/linktest.c | 255
progs/glsl/mandelbrot.c | 215
progs/glsl/mandelbrot.shtest | 13
progs/glsl/multinoise.c | 278
progs/glsl/multitex.c | 412
progs/glsl/multitex.frag | 15
progs/glsl/multitex.shtest | 6
progs/glsl/multitex.vert | 14
progs/glsl/noise.c | 216
progs/glsl/noise2.c | 200
progs/glsl/pointcoord.c | 201
progs/glsl/points.c | 257
progs/glsl/reflect.vert | 20
progs/glsl/samplers.c | 375
progs/glsl/shadow_sampler.c | 337
progs/glsl/shadowtex.frag | 21
progs/glsl/shtest.c | 711
progs/glsl/simple.vert | 9
progs/glsl/skinning.c | 280
progs/glsl/skinning.frag | 6
progs/glsl/skinning.vert | 24
progs/glsl/texaaline.c | 372
progs/glsl/texdemo1.c | 438
progs/glsl/toyball.c | 221
progs/glsl/toyball.shtest | 17
progs/glsl/trirast.c | 255
progs/glsl/twoside.c | 305
progs/glsl/vert-or-frag-only.c | 187
progs/glsl/vert-tex.c | 267
progs/objviewer/.gitignore | 8
progs/objviewer/GreatLakesBiplaneHP.mtl | 161
progs/objviewer/GreatLakesBiplaneHP.obj |497539 ----------
progs/objviewer/Makefile | 83
progs/objviewer/README.txt | 23
progs/objviewer/bobcat.mtl | 72
progs/objviewer/bobcat.obj | 9251
progs/objviewer/buddha.obj |149990 ---
progs/objviewer/bunny.obj |104501 --
progs/objviewer/glm.c | 1919
progs/objviewer/glm.h | 287
progs/objviewer/glmdraw.c | 455
progs/objviewer/objview.c | 515
progs/objviewer/skybox.c | 187
progs/objviewer/skybox.h | 18
progs/osdemos/Makefile | 2
progs/osdemos/ostest1.c | 6
progs/redbook/.gitignore | 77
progs/redbook/Makefile | 109
progs/redbook/Makefile.win | 78
progs/redbook/README | 41
progs/redbook/SConscript | 86
progs/redbook/aaindex.c | 153
progs/redbook/aapoly.c | 171
progs/redbook/aargb.c | 149
progs/redbook/accanti.c | 182
progs/redbook/accpersp.c | 240
progs/redbook/alpha.c | 143
progs/redbook/alpha3D.c | 185
progs/redbook/anti.c | 124
progs/redbook/bezcurve.c | 114
progs/redbook/bezmesh.c | 162
progs/redbook/checker.c | 140
progs/redbook/clip.c | 108
progs/redbook/colormat.c | 153
progs/redbook/combiner.c | 379
progs/redbook/convolution.c | 218
progs/redbook/cube.c | 97
progs/redbook/cubemap.c | 205
progs/redbook/depthcue.c | 115
progs/redbook/dof.c | 251
progs/redbook/double.c | 146
progs/redbook/drawf.c | 103
progs/redbook/feedback.c | 173
progs/redbook/fog.c | 200
progs/redbook/fogcoord.c | 194
progs/redbook/fogindex.c | 152
progs/redbook/font.c | 167
progs/redbook/hello.c | 110
progs/redbook/histogram.c | 213
progs/redbook/image.c | 159
progs/redbook/jitter.h | 222
progs/redbook/light.c | 113
progs/redbook/lines.c | 138
progs/redbook/list.c | 125
progs/redbook/material.c | 306
progs/redbook/minmax.c | 182
progs/redbook/mipmap.c | 178
progs/redbook/model.c | 126
progs/redbook/movelight.c | 148
progs/redbook/multisamp.c | 188
progs/redbook/multitex.c | 177
progs/redbook/mvarray.c | 136
progs/redbook/nurbs.c | 190
progs/redbook/pickdepth.c | 217
progs/redbook/picksquare.c | 197
progs/redbook/plane.c | 171
progs/redbook/planet.c | 123
progs/redbook/pointp.c | 179
progs/redbook/polyoff.c | 323
progs/redbook/polys.c | 138
progs/redbook/quadric.c | 191
progs/redbook/robot.c | 132
progs/redbook/sccolorlight.c | 141
progs/redbook/scene.c | 141
progs/redbook/scenebamb.c | 140
progs/redbook/sceneflat.c | 140
progs/redbook/select.c | 222
progs/redbook/shadowmap.c | 352
progs/redbook/smooth.c | 106
progs/redbook/stencil.c | 193
progs/redbook/stroke.c | 195
progs/redbook/surface.c | 232
progs/redbook/surfpoints.c | 280
progs/redbook/teaambient.c | 162
progs/redbook/teapots.c | 220
progs/redbook/tess.c | 241
progs/redbook/tesswind.c | 290
progs/redbook/texbind.c | 171
progs/redbook/texgen.c | 207
progs/redbook/texprox.c | 120
progs/redbook/texsub.c | 187
progs/redbook/texture3d.c | 163
progs/redbook/texturesurf.c | 155
progs/redbook/torus.c | 152
progs/redbook/trim.c | 187
progs/redbook/unproject.c | 126
progs/redbook/varray.c | 195
progs/redbook/wrap.c | 180
progs/xdemos/Makefile | 4
src/egl/drivers/dri2/egl_dri2.c | 4
src/egl/drivers/glx/Makefile | 4
src/egl/main/Makefile | 2
src/gallium/auxiliary/draw/draw_context.c | 65
src/gallium/auxiliary/draw/draw_context.h | 5
src/gallium/auxiliary/draw/draw_pipe_aaline.c | 49
src/gallium/auxiliary/draw/draw_pipe_aapoint.c | 39
src/gallium/auxiliary/draw/draw_pipe_wide_line.c | 34
src/gallium/auxiliary/draw/draw_pipe_wide_point.c | 20
src/gallium/auxiliary/draw/draw_private.h | 15
src/gallium/auxiliary/draw/draw_vs_ppc.c | 2
src/gallium/auxiliary/indices/.gitignore | 2
src/gallium/auxiliary/indices/u_indices_gen.c | 5129
src/gallium/auxiliary/indices/u_unfilled_gen.c | 992
src/gallium/auxiliary/rtasm/rtasm_x86sse.c | 2
src/gallium/docs/source/cso/blend.rst | 55
src/gallium/docs/source/cso/dsa.rst | 61
src/gallium/docs/source/cso/rasterizer.rst | 151
src/gallium/docs/source/cso/sampler.rst | 109
src/gallium/docs/source/cso/shader.rst | 12
src/gallium/drivers/cell/ppu/cell_context.c | 2
src/gallium/drivers/cell/ppu/cell_fence.c | 1
src/gallium/drivers/cell/ppu/cell_pipe_state.c | 2
src/gallium/drivers/i915/i915_context.c | 2
src/gallium/drivers/i915/i915_state.c | 3
src/gallium/drivers/llvmpipe/lp_context.c | 2
src/gallium/drivers/llvmpipe/lp_state_rasterizer.c | 14
src/gallium/drivers/nv30/nv30_context.c | 2
src/gallium/drivers/nv40/nv40_context.c | 2
src/gallium/drivers/nv40/nv40_state_emit.c | 2
src/gallium/drivers/nv50/nv50_context.c | 2
src/gallium/drivers/r300/r300_context.c | 2
src/gallium/drivers/r300/r300_state.c | 2
src/gallium/drivers/softpipe/sp_context.c | 2
src/gallium/drivers/softpipe/sp_state_rasterizer.c | 2
src/gallium/drivers/svga/svga_pipe_rasterizer.c | 3
src/gallium/drivers/svga/svga_swtnl_draw.c | 2
src/gallium/drivers/svga/svga_swtnl_state.c | 3
src/gallium/state_trackers/egl/Makefile | 1
src/gallium/state_trackers/egl/x11/glxinit.c | 4
src/gallium/state_trackers/egl/x11/native_dri2.c | 14
src/gallium/state_trackers/egl/x11/native_x11.c | 2
src/gallium/state_trackers/egl/x11/x11_screen.c | 76
src/gallium/state_trackers/egl/x11/x11_screen.h | 26
src/gallium/state_trackers/glx/xlib/Makefile | 3
src/gallium/winsys/drm/Makefile.egl | 2
src/gallium/winsys/xlib/Makefile | 3
src/glew/LICENSE.txt | 73
src/glew/Makefile | 54
src/glew/SConscript | 68
src/glew/glew.c |13358
src/glew/glewinfo.c | 7874
src/glew/visualinfo.c | 1173
src/glw/Makefile | 2
src/glx/Makefile | 2
src/glx/XF86dri.c | 2
src/glx/clientattrib.c | 2
src/glx/dri2_glx.c | 18
src/glx/dri_common.c | 2
src/glx/dri_glx.c | 2
src/glx/drisw_glx.c | 2
src/glx/glcontextmodes.c | 4
src/glx/glx_pbuffer.c | 202
src/glx/glxclient.h | 20
src/glx/glxcmds.c | 216
src/glx/glxcurrent.c | 69
src/glx/glxext.c | 94
src/glx/glxextensions.c | 38
src/glx/indirect.c | 30
src/glx/indirect_size.c | 2
src/glx/singlepix.c | 2
src/mesa/drivers/common/meta.c | 36
src/mesa/drivers/dri/common/xmlconfig.c | 2
src/mesa/drivers/dri/i915/i915_tex_layout.c | 2
src/mesa/drivers/dri/i915/i915_texstate.c | 4
src/mesa/drivers/dri/i915/i915_vtbl.c | 4
src/mesa/drivers/dri/i965/brw_clip.c | 6
src/mesa/drivers/dri/i965/brw_clip_state.c | 4
src/mesa/drivers/dri/i965/brw_clip_tri.c | 22
src/mesa/drivers/dri/i965/brw_clip_util.c | 4
src/mesa/drivers/dri/i965/brw_context.c | 4
src/mesa/drivers/dri/i965/brw_defines.h | 10
src/mesa/drivers/dri/i965/brw_draw_upload.c | 6
src/mesa/drivers/dri/i965/brw_eu_emit.c | 154
src/mesa/drivers/dri/i965/brw_gs.c | 2
src/mesa/drivers/dri/i965/brw_gs_state.c | 2
src/mesa/drivers/dri/i965/brw_misc_state.c | 8
src/mesa/drivers/dri/i965/brw_program.c | 34
src/mesa/drivers/dri/i965/brw_sf_emit.c | 4
src/mesa/drivers/dri/i965/brw_sf_state.c | 19
src/mesa/drivers/dri/i965/brw_structs.h | 18
src/mesa/drivers/dri/i965/brw_tex_layout.c | 84
src/mesa/drivers/dri/i965/brw_urb.c | 2
src/mesa/drivers/dri/i965/brw_vs_emit.c | 8
src/mesa/drivers/dri/i965/brw_vs_state.c | 6
src/mesa/drivers/dri/i965/brw_wm.h | 2
src/mesa/drivers/dri/i965/brw_wm_emit.c | 18
src/mesa/drivers/dri/i965/brw_wm_glsl.c | 2
src/mesa/drivers/dri/i965/brw_wm_state.c | 4
src/mesa/drivers/dri/i965/brw_wm_surface_state.c | 2
src/mesa/drivers/dri/intel/intel_chipset.h | 4
src/mesa/drivers/dri/intel/intel_context.c | 30
src/mesa/drivers/dri/intel/intel_context.h | 2
src/mesa/drivers/dri/intel/intel_fbo.c | 13
src/mesa/drivers/dri/intel/intel_fbo.h | 3
src/mesa/drivers/dri/intel/intel_mipmap_tree.c | 7
src/mesa/drivers/dri/intel/intel_pixel_draw.c | 2
src/mesa/drivers/dri/intel/intel_tex_format.c | 14
src/mesa/drivers/dri/intel/intel_tex_layout.c | 8
src/mesa/drivers/dri/intel/intel_tex_layout.h | 2
src/mesa/drivers/dri/r300/compiler/radeon_pair_schedule.c | 86
src/mesa/drivers/dri/r300/r300_state.c | 15
src/mesa/drivers/dri/r600/r700_state.c | 5
src/mesa/drivers/dri/radeon/radeon_cs_legacy.c | 2
src/mesa/drivers/dri/radeon/radeon_mipmap_tree.c | 8
src/mesa/drivers/dri/radeon/radeon_screen.c | 2
src/mesa/drivers/osmesa/Makefile | 6
src/mesa/drivers/osmesa/osmesa.c | 37
src/mesa/drivers/windows/fx/fx.rc | 39
src/mesa/drivers/windows/fx/fxopengl.def | 955
src/mesa/drivers/windows/fx/fxwgl.c | 1307
src/mesa/drivers/windows/gdi/InitCritSections.cpp | 32
src/mesa/drivers/windows/gdi/colors.h | 29
src/mesa/drivers/windows/gdi/mesa.def | 963
src/mesa/drivers/windows/gdi/wgl.c | 707
src/mesa/drivers/windows/gdi/wmesa.c | 1661
src/mesa/drivers/windows/gdi/wmesadef.h | 43
src/mesa/drivers/windows/gldirect/ddlog.c | 192
src/mesa/drivers/windows/gldirect/ddlog.h | 109
src/mesa/drivers/windows/gldirect/dglcontext.c | 2212
src/mesa/drivers/windows/gldirect/dglcontext.h | 281
src/mesa/drivers/windows/gldirect/dglglobals.c | 149
src/mesa/drivers/windows/gldirect/dglglobals.h | 198
src/mesa/drivers/windows/gldirect/dglmacros.h | 91
src/mesa/drivers/windows/gldirect/dglpf.c | 620
src/mesa/drivers/windows/gldirect/dglpf.h | 77
src/mesa/drivers/windows/gldirect/dglwgl.c | 2964
src/mesa/drivers/windows/gldirect/dglwgl.h | 127
src/mesa/drivers/windows/gldirect/dll_main.c | 817
src/mesa/drivers/windows/gldirect/dllmain.h | 64
src/mesa/drivers/windows/gldirect/gld_debug_clip.c | 39
src/mesa/drivers/windows/gldirect/gld_debug_norm.c | 39
src/mesa/drivers/windows/gldirect/gld_debug_xform.c | 41
src/mesa/drivers/windows/gldirect/gld_dispatch.c | 73
src/mesa/drivers/windows/gldirect/gld_driver.c | 279
src/mesa/drivers/windows/gldirect/gld_driver.h | 90
src/mesa/drivers/windows/gldirect/gldirect.rc | 43
src/mesa/drivers/windows/gldirect/gldlame8.c | 181
src/mesa/drivers/windows/gldirect/mesasw/colors.h | 520
src/mesa/drivers/windows/gldirect/mesasw/gld_wgl_mesasw.c | 1682
src/mesa/drivers/windows/gldirect/opengl32.def | 488
src/mesa/drivers/windows/gldirect/opengl32.ref | 495
src/mesa/drivers/windows/gldirect/pixpack.h | 108
src/mesa/drivers/windows/icd/icd.c | 347
src/mesa/drivers/windows/icd/icdlist.h | 336
src/mesa/drivers/windows/icd/mesa.def | 102
src/mesa/glapi/glapi_nop.c | 20
src/mesa/main/fbobject.c | 6
src/mesa/main/imports.c | 3
src/mesa/main/imports.h | 6
src/mesa/main/texfetch_tmp.h | 16
src/mesa/main/version.h | 4
src/mesa/shader/shader_api.c | 79
src/mesa/shader/slang/slang_codegen.c | 3
src/mesa/shader/slang/slang_compile_variable.h | 2
src/mesa/shader/slang/slang_link.c | 5
src/mesa/state_tracker/st_atom_scissor.c | 13
src/mesa/state_tracker/st_cb_texture.c | 5
src/mesa/state_tracker/st_context.c | 2
src/mesa/state_tracker/st_draw_feedback.c | 2
src/mesa/state_tracker/st_extensions.c | 91
src/mesa/state_tracker/st_format.c | 4
src/mesa/state_tracker/st_gen_mipmap.c | 4
src/mesa/state_tracker/st_mesa_to_tgsi.c | 2
windows/VC8/mesa/.gitignore | 30
windows/VC8/mesa/gdi/gdi.vcproj | 445
windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcproj | 305
windows/VC8/mesa/glu/glu.vcproj | 1202
windows/VC8/mesa/mesa.sln | 77
windows/VC8/mesa/mesa/mesa.vcproj | 2430
windows/VC8/mesa/osmesa/osmesa.vcproj | 413
windows/VC8/progs/.gitignore | 17
windows/VC8/progs/demos/gears.vcproj | 409
windows/VC8/progs/glut/glut.vcproj | 625
windows/VC8/progs/progs.sln | 38
457 files changed, 74162 insertions(+), 1008449 deletions(-)
New commits:
commit d0691bdef0705167562c3560269bcac33ee455c3
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Jul 20 15:52:19 2010 +0200
Upload to experimental
diff --git a/debian/changelog b/debian/changelog
index a696542..c0d0e60 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mesa (7.8.2-2) UNRELEASED; urgency=low
+mesa (7.8.2-2) experimental; urgency=low
* Add missing dependencies to libegl1-mesa-dev, thanks to Alexandros
Frantzis (LP: #600243).
@@ -8,7 +8,7 @@ mesa (7.8.2-2) UNRELEASED; urgency=low
* Pull from 7.8-branch up to commit d06e011.
* Fixup hurd and kfreebsd patches to apply.
- -- Julien Cristau <jcristau@debian.org> Thu, 15 Jul 2010 17:05:56 +0100
+ -- Julien Cristau <jcristau@debian.org> Tue, 20 Jul 2010 15:57:31 +0200
mesa (7.8.2-1) experimental; urgency=low
commit c282b0efd9cb80df4cb6b11af1aa6ea9bca28597
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Jul 20 14:56:46 2010 +0100
Fixup hurd and kfreebsd patches to apply.
diff --git a/debian/changelog b/debian/changelog
index 7047ab7..a696542 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ mesa (7.8.2-2) UNRELEASED; urgency=low
* intel: Fix invalidate before initialisation (stolen from fdo bugzilla
#29091, fixes server 1.9rc crash when starting an app using GLX 1.3)
* Pull from 7.8-branch up to commit d06e011.
+ * Fixup hurd and kfreebsd patches to apply.
-- Julien Cristau <jcristau@debian.org> Thu, 15 Jul 2010 17:05:56 +0100
diff --git a/debian/patches/05_hurd-ftbfs.diff b/debian/patches/05_hurd-ftbfs.diff
index 632dba4..530fa90 100644
--- a/debian/patches/05_hurd-ftbfs.diff
+++ b/debian/patches/05_hurd-ftbfs.diff
@@ -9,21 +9,21 @@ Index: mesa/configure.ac
===================================================================
--- mesa.orig/configure.ac
+++ mesa/configure.ac
-@@ -584,6 +584,13 @@
+@@ -585,6 +585,13 @@
enable_xcb=no
fi
+dnl Direct rendering or just indirect rendering
+AC_ARG_ENABLE([driglx-direct],
+ [AS_HELP_STRING([--disable-driglx-direct],
-+ [enable direct rendering in GLX for DRI @<:@default=enabled@:>@])],
++ [enable direct rendering in GLX and EGL for DRI @<:@default=enabled@:>@])],
+ [driglx_direct="$enableval"],
+ [driglx_direct="yes"])
+
dnl
dnl libGL configuration per driver
dnl
-@@ -617,12 +624,14 @@
+@@ -618,12 +625,14 @@
AC_MSG_ERROR([Can't use static libraries for DRI drivers])
fi
@@ -44,14 +44,14 @@ Index: mesa/configure.ac
# find the DRI deps for libGL
if test "$x11_pkgconfig" = yes; then
-@@ -696,12 +705,6 @@
+@@ -697,12 +706,6 @@
[DRI_DRIVER_SEARCH_DIR="$withval"],
[DRI_DRIVER_SEARCH_DIR='${DRI_DRIVER_INSTALL_DIR}'])
AC_SUBST([DRI_DRIVER_SEARCH_DIR])
-dnl Direct rendering or just indirect rendering
-AC_ARG_ENABLE([driglx-direct],
- [AS_HELP_STRING([--disable-driglx-direct],
-- [enable direct rendering in GLX for DRI @<:@default=enabled@:>@])],
+- [enable direct rendering in GLX and EGL for DRI @<:@default=enabled@:>@])],
- [driglx_direct="$enableval"],
- [driglx_direct="yes"])
dnl Which drivers to build - default is chosen by platform
diff --git a/debian/patches/06_kfreebsd-ftbfs.diff b/debian/patches/06_kfreebsd-ftbfs.diff
index a8a1e93..285c434 100644
--- a/debian/patches/06_kfreebsd-ftbfs.diff
+++ b/debian/patches/06_kfreebsd-ftbfs.diff
@@ -12,7 +12,7 @@ Index: mesa/configure.ac
===================================================================
--- mesa.orig/configure.ac
+++ mesa/configure.ac
-@@ -776,7 +776,7 @@
+@@ -777,7 +777,7 @@
;;
esac
;;
commit 9b09a71f80d03f158889fae041c2f40325612a38
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Jul 20 14:35:29 2010 +0100
Bump changelog
diff --git a/debian/changelog b/debian/changelog
index 5bb9d8f..7047ab7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ mesa (7.8.2-2) UNRELEASED; urgency=low
* gallium: handle kfreebsd like freebsd, fixing FTBFS (closes: #585618)
* intel: Fix invalidate before initialisation (stolen from fdo bugzilla
#29091, fixes server 1.9rc crash when starting an app using GLX 1.3)
+ * Pull from 7.8-branch up to commit d06e011.
-- Julien Cristau <jcristau@debian.org> Thu, 15 Jul 2010 17:05:56 +0100
commit 51282b0ad8f4605c6e28ddcd79901baed0bd0e40
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Jul 20 14:30:51 2010 +0100
intel: Fix invalidate before initialisation
Stolen from fdo bugzilla #29091
Fixes server 1.9rc crash when starting an app using GLX 1.3
diff --git a/debian/changelog b/debian/changelog
index 545b21f..5bb9d8f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ mesa (7.8.2-2) UNRELEASED; urgency=low
* Add missing dependencies to libegl1-mesa-dev, thanks to Alexandros
Frantzis (LP: #600243).
* gallium: handle kfreebsd like freebsd, fixing FTBFS (closes: #585618)
+ * intel: Fix invalidate before initialisation (stolen from fdo bugzilla
+ #29091, fixes server 1.9rc crash when starting an app using GLX 1.3)
-- Julien Cristau <jcristau@debian.org> Thu, 15 Jul 2010 17:05:56 +0100
diff --git a/debian/patches/09-intel-fix-invalidate-before-initialisation.diff b/debian/patches/09-intel-fix-invalidate-before-initialisation.diff
new file mode 100644
index 0000000..3af5eed
--- /dev/null
+++ b/debian/patches/09-intel-fix-invalidate-before-initialisation.diff
@@ -0,0 +1,73 @@
+From dd7853f327ad7a286a59c9c5956d4989c31a58fa Mon Sep 17 00:00:00 2001
+From: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Fri, 16 Jul 2010 12:24:53 +0100
+Subject: [PATCH] intel: Fix invalidate before initialisation
+
+Fixes:
+
+ Bug 29091 - 1.9RC5 server crash when starting GLX 1.3 app with mesa 7.8
+ Intel dri2 driver.
+ https://bugs.freedesktop.org/show_bug.cgi?id=29091
+
+Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+---
+ src/mesa/drivers/dri/common/dri_util.c | 2 +-
+ src/mesa/drivers/dri/intel/intel_screen.c | 19 +++++++++++++++----
+ 2 files changed, 16 insertions(+), 5 deletions(-)
+
+diff --git a/src/mesa/drivers/dri/common/dri_util.c b/src/mesa/drivers/dri/common/dri_util.c
+index 75c9882..9a9bfed 100644
+--- a/src/mesa/drivers/dri/common/dri_util.c
++++ b/src/mesa/drivers/dri/common/dri_util.c
+@@ -432,7 +432,7 @@ driCreateNewDrawable(__DRIscreen *psp, const __DRIconfig *config,
+ */
+ (void) attrs;
+
+- pdp = malloc(sizeof *pdp);
++ pdp = calloc(1, sizeof *pdp);
+ if (!pdp) {
+ return NULL;
+ }
+diff --git a/src/mesa/drivers/dri/intel/intel_screen.c b/src/mesa/drivers/dri/intel/intel_screen.c
+index 6e4bb64..083b7bb 100644
+--- a/src/mesa/drivers/dri/intel/intel_screen.c
++++ b/src/mesa/drivers/dri/intel/intel_screen.c
+@@ -102,10 +102,21 @@ static const __DRItexBufferExtension intelTexBufferExtension = {
+ intelSetTexBuffer2,
+ };
+
++static inline struct intel_context *
++to_intel_context(__DRIdrawable *drawable)
++{
++ if (drawable->driContextPriv == NULL)
++ return NULL;
++
++ return drawable->driContextPriv->driverPrivate;
++}
++
+ static void
+ intelDRI2Flush(__DRIdrawable *drawable)
+ {
+- struct intel_context *intel = drawable->driContextPriv->driverPrivate;
++ struct intel_context *intel = to_intel_context(drawable);
++ if (!intel)
++ return;
+
+ if (intel->gen < 4)
+ INTEL_FIREVERTICES(intel);
+@@ -117,9 +128,9 @@ intelDRI2Flush(__DRIdrawable *drawable)
+ static void
+ intelDRI2Invalidate(__DRIdrawable *drawable)
+ {
+- struct intel_context *intel = drawable->driContextPriv->driverPrivate;
+-
+- intel->using_dri2_swapbuffers = GL_TRUE;
++ struct intel_context *intel = to_intel_context(drawable);
++ if (intel)
++ intel->using_dri2_swapbuffers = GL_TRUE;
+ dri2InvalidateDrawable(drawable);
+ }
+
+--
+1.7.1
+
diff --git a/debian/patches/series b/debian/patches/series
index ccf4830..e8da51e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@
06_kfreebsd-ftbfs.diff
07-nouveau-update.diff
08-kfreebsd-gallium.diff
+09-intel-fix-invalidate-before-initialisation.diff
commit 1487dab78d7f037ca17e43bdf8c99f4f371630d5
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Jul 20 14:25:53 2010 +0100
gallium: handle kfreebsd like freebsd, fixing FTBFS (closes: #585618)
diff --git a/debian/changelog b/debian/changelog
index fb4c950..545b21f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ mesa (7.8.2-2) UNRELEASED; urgency=low
* Add missing dependencies to libegl1-mesa-dev, thanks to Alexandros
Frantzis (LP: #600243).
+ * gallium: handle kfreebsd like freebsd, fixing FTBFS (closes: #585618)
-- Julien Cristau <jcristau@debian.org> Thu, 15 Jul 2010 17:05:56 +0100
diff --git a/debian/patches/08-kfreebsd-gallium.diff b/debian/patches/08-kfreebsd-gallium.diff
new file mode 100644
index 0000000..baeb123
--- /dev/null
+++ b/debian/patches/08-kfreebsd-gallium.diff
@@ -0,0 +1,26 @@
+Index: mesa/src/gallium/auxiliary/rtasm/rtasm_execmem.c
+===================================================================
+--- mesa.orig/src/gallium/auxiliary/rtasm/rtasm_execmem.c
++++ mesa/src/gallium/auxiliary/rtasm/rtasm_execmem.c
+@@ -37,7 +37,7 @@
+
+ #include "rtasm_execmem.h"
+
+-#if defined(PIPE_OS_BSD)
++#ifndef MAP_ANONYMOUS
+ #define MAP_ANONYMOUS MAP_ANON
+ #endif
+
+Index: mesa/src/gallium/include/pipe/p_config.h
+===================================================================
+--- mesa.orig/src/gallium/include/pipe/p_config.h
++++ mesa/src/gallium/include/pipe/p_config.h
+@@ -128,7 +128,7 @@
+ #define PIPE_OS_UNIX
+ #endif
+
+-#if defined(__FreeBSD__)
++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+ #define PIPE_OS_FREEBSD
+ #define PIPE_OS_BSD
+ #define PIPE_OS_UNIX
diff --git a/debian/patches/series b/debian/patches/series
index d4df6df..ccf4830 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
05_hurd-ftbfs.diff
06_kfreebsd-ftbfs.diff
07-nouveau-update.diff
+08-kfreebsd-gallium.diff
commit d06e0117e302bc314baa75e02e8268936982e6c6
Author: Chia-I Wu <olv@lunarg.com>
Date: Fri Jul 16 20:09:29 2010 +0800
st/egl: Fix build on FreeBSD.
There is no libdl on FreeBSD. Based on patch from Thinker
<thinker@branda.to>, which is against 7.8.
This fixes fdo bug #29093.
(cherry picked from commit 08f4bc07e424aaeb35eb58736fdca64b1398c190)
diff --git a/configs/autoconf.in b/configs/autoconf.in
index b6071f8..6218be9 100644
--- a/configs/autoconf.in
+++ b/configs/autoconf.in
@@ -29,6 +29,9 @@ X11_CFLAGS = @X11_CFLAGS@
GLW_CFLAGS = @GLW_CFLAGS@
GLUT_CFLAGS = @GLUT_CFLAGS@
+# dlopen
+DLOPEN_LIBS = @DLOPEN_LIBS@
+
# Assembler
MESA_ASM_SOURCES = @MESA_ASM_SOURCES@
GLAPI_ASM_SOURCES = @GLAPI_ASM_SOURCES@
diff --git a/configs/default b/configs/default
index f12bec8..d4b45a3 100644
--- a/configs/default
+++ b/configs/default
@@ -121,6 +121,8 @@ APP_LIB_DEPS = $(EXTRA_LIB_PATH) -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LI
APP_LIB_DEPS = -lm
X11_LIBS = -lX11
+DLOPEN_LIBS = -ldl
+
# Installation directories (for make install)
INSTALL_DIR = /usr/local
INSTALL_LIB_DIR = $(INSTALL_DIR)/$(LIB_DIR)
diff --git a/configure.ac b/configure.ac
index 81fd320..e15371f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -398,6 +398,7 @@ dnl Check to see if dlopen is in default libraries (like Solaris, which
dnl has it in libc), or if libdl is needed to get it.
AC_CHECK_FUNC([dlopen], [],
[AC_CHECK_LIB([dl], [dlopen], [DLOPEN_LIBS="-ldl"])])
+AC_SUBST([DLOPEN_LIBS])
dnl See if posix_memalign is available
AC_CHECK_FUNC([posix_memalign], [DEFINES="$DEFINES -DHAVE_POSIX_MEMALIGN"])
diff --git a/src/gallium/winsys/drm/Makefile.egl b/src/gallium/winsys/drm/Makefile.egl
index 8363de6..c48967f 100644
--- a/src/gallium/winsys/drm/Makefile.egl
+++ b/src/gallium/winsys/drm/Makefile.egl
@@ -11,7 +11,7 @@
EGL_DRIVER_OBJECTS = $(EGL_DRIVER_SOURCES:.c=.o)
-common_LIBS = -ldrm -lm -ldl
+common_LIBS = -ldrm -lm $(DLOPEN_LIBS)
x11_ST = $(TOP)/src/gallium/state_trackers/egl/libeglx11.a
x11_LIBS = $(common_LIBS) -lX11 -lXext -lXfixes
commit b5c9ba9dbfa4fdf0e6b1eca3f5c2e0097fe41b7f
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Jul 15 17:07:01 2010 +0100
Add missing dependencies to libegl1-mesa-dev
Thanks to Alexandros Frantzis (LP: #600243).
diff --git a/debian/changelog b/debian/changelog
index afd0d35..fb4c950 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mesa (7.8.2-2) UNRELEASED; urgency=low
+
+ * Add missing dependencies to libegl1-mesa-dev, thanks to Alexandros
+ Frantzis (LP: #600243).
+
+ -- Julien Cristau <jcristau@debian.org> Thu, 15 Jul 2010 17:05:56 +0100
+
mesa (7.8.2-1) experimental; urgency=low
[ Robert Hooker ]
diff --git a/debian/control b/debian/control
index 1c9e48a..55c2ea6 100644
--- a/debian/control
+++ b/debian/control
@@ -151,6 +151,14 @@ Section: libdevel
Architecture: any
Depends:
libegl1-mesa (= ${binary:Version}),
+ libdrm-dev (>= 2.4.19) [!hurd-i386],
+ x11proto-dri2-dev (>= 2.1),
+ x11proto-gl-dev (>= 1.4.11),
+ libx11-dev,
+ libxext-dev,
+ libxxf86vm-dev,
+ libxdamage-dev,
+ libxfixes-dev,
${misc:Depends},
Description: A free implementation of the EGL API -- development files
This package contains the development environment required for compiling
commit b69d5414aa6ed1a816fc2a15a287325b376cebef
Author: Tom Stellard <tstellar@gmail.com>
Date: Sun Jul 4 12:30:52 2010 -0700
r300/compiler: Fix scheduling of TEX instructions.
The following instruction sequence will no longer be emitted in separate
TEX blocks:
0: TEX temp[0].xyz, temp[1].xy__, 2D[0];
1: TEX temp[1].xyz, temp[2].xy__, 2D[0];
This fixes fdo bug #25109
(cherry picked from commit 3724a2e65f5b3aa6e123889342a3e9c4d05903f5)
diff --git a/src/mesa/drivers/dri/r300/compiler/radeon_pair_schedule.c b/src/mesa/drivers/dri/r300/compiler/radeon_pair_schedule.c
index df67aaf..b8ee288 100644
--- a/src/mesa/drivers/dri/r300/compiler/radeon_pair_schedule.c
+++ b/src/mesa/drivers/dri/r300/compiler/radeon_pair_schedule.c
@@ -141,12 +141,28 @@ static void add_inst_to_list(struct schedule_instruction ** list, struct schedul
*list = inst;
}
+static void add_inst_to_list_end(struct schedule_instruction ** list,
+ struct schedule_instruction * inst)
+{
+ if(!*list){
+ *list = inst;
+ }else{
+ struct schedule_instruction * temp = *list;
+ while(temp->NextReady){
+ temp = temp->NextReady;
+ }
+ temp->NextReady = inst;
+ }
+}
+
static void instruction_ready(struct schedule_state * s, struct schedule_instruction * sinst)
{
DBG("%i is now ready\n", sinst->Instruction->IP);
+ /* Adding Ready TEX instructions to the end of the "Ready List" helps
+ * us emit TEX instructions in blocks without losing our place. */
if (sinst->Instruction->Type == RC_INSTRUCTION_NORMAL)
- add_inst_to_list(&s->ReadyTEX, sinst);
+ add_inst_to_list_end(&s->ReadyTEX, sinst);
else if (sinst->Instruction->U.P.Alpha.Opcode == RC_OPCODE_NOP)
add_inst_to_list(&s->ReadyRGB, sinst);
else if (sinst->Instruction->U.P.RGB.Opcode == RC_OPCODE_NOP)
@@ -163,11 +179,14 @@ static void decrease_dependencies(struct schedule_state * s, struct schedule_ins
instruction_ready(s, sinst);
}
-static void commit_instruction(struct schedule_state * s, struct schedule_instruction * sinst)
-{
- DBG("%i: commit\n", sinst->Instruction->IP);
-
- for(unsigned int i = 0; i < sinst->NumReadValues; ++i) {
+/**
+ * This function decreases the dependencies of the next instruction that
+ * wants to write to each of sinst's read values.
+ */
+static void commit_update_reads(struct schedule_state * s,
+ struct schedule_instruction * sinst){
+ unsigned int i;
+ for(i = 0; i < sinst->NumReadValues; ++i) {
struct reg_value * v = sinst->ReadValues[i];
assert(v->NumReaders > 0);
v->NumReaders--;
@@ -176,8 +195,12 @@ static void commit_instruction(struct schedule_state * s, struct schedule_instru
decrease_dependencies(s, v->Next->Writer);
}
}
+}
- for(unsigned int i = 0; i < sinst->NumWriteValues; ++i) {
+static void commit_update_writes(struct schedule_state * s,
+ struct schedule_instruction * sinst){
+ unsigned int i;
+ for(i = 0; i < sinst->NumWriteValues; ++i) {
struct reg_value * v = sinst->WriteValues[i];
if (v->NumReaders) {
for(struct reg_value_reader * r = v->Readers; r; r = r->Next) {
@@ -196,6 +219,15 @@ static void commit_instruction(struct schedule_state * s, struct schedule_instru
}
}
+static void commit_alu_instruction(struct schedule_state * s, struct schedule_instruction * sinst)
+{
+ DBG("%i: commit\n", sinst->Instruction->IP);
+
+ commit_update_reads(s, sinst);
+
+ commit_update_writes(s, sinst);
+}
+
/**
* Emit all ready texture instructions in a single block.
*
@@ -208,21 +240,37 @@ static void emit_all_tex(struct schedule_state * s, struct rc_instruction * befo
assert(s->ReadyTEX);
- /* Don't let the ready list change under us! */
- readytex = s->ReadyTEX;
- s->ReadyTEX = 0;
-
/* Node marker for R300 */
struct rc_instruction * inst_begin = rc_insert_new_instruction(s->C, before->Prev);
inst_begin->U.I.Opcode = RC_OPCODE_BEGIN_TEX;
/* Link texture instructions back in */
+ readytex = s->ReadyTEX;
while(readytex) {
- struct schedule_instruction * tex = readytex;
+ rc_insert_instruction(before->Prev, readytex->Instruction);
+ DBG("%i: commit TEX reads\n", readytex->Instruction->IP);
+
+ /* All of the TEX instructions in the same TEX block have
+ * their source registers read from before any of the
+ * instructions in that block write to their destination
+ * registers. This means that when we commit a TEX
+ * instruction, any other TEX instruction that wants to write
+ * to one of the committed instruction's source register can be
+ * marked as ready and should be emitted in the same TEX
+ * block. This prevents the following sequence from being
+ * emitted in two different TEX blocks:
+ * 0: TEX temp[0].xyz, temp[1].xy__, 2D[0];
+ * 1: TEX temp[1].xyz, temp[2].xy__, 2D[0];
+ */
+ commit_update_reads(s, readytex);
+ readytex = readytex->NextReady;
+ }
+ readytex = s->ReadyTEX;
+ s->ReadyTEX = 0;
+ while(readytex){
+ DBG("%i: commit TEX writes\n", readytex->Instruction->IP);
+ commit_update_writes(s, readytex);
Reply to: