.gitignore | 33
CMakeLists.txt | 112
Makefile.am | 3
autogen.sh | 13
configure.ac | 136
debian/changelog | 33
debian/control | 1
debian/copyright | 235
debian/mesa-utils-extra.install | 3
debian/patches/properly_defining_default_precision_es2gears.patch | 36
debian/patches/series | 1
debian/watch | 1
dev/null |binary
index.html | 118
m4/ac_define_dir.m4 | 49
src/CMakeLists.txt | 14
src/Makefile.am | 2
src/data/CMakeLists.txt | 3
src/data/Makefile.am | 40
src/data/arch.rgb |binary
src/data/bw.rgb |binary
src/data/geartrain.dat | 119
src/data/girl.rgb |binary
src/data/girl2.rgb |binary
src/data/isosurf.dat | 7179 ++++++++++
src/data/reflect.rgb |binary
src/data/s128.rgb |binary
src/data/terrain.dat | 1
src/data/tile.rgb |binary
src/data/tree2.rgba |binary
src/data/tree3.rgb |binary
src/data/wrs_logo.rgb |binary
src/demos/.gitignore | 3
src/demos/CMakeLists.txt | 11
src/demos/Makefile.am | 7
src/demos/Makefile.cygnus | 1
src/demos/Makefile.win | 131
src/demos/Windows/all.dsp | 101
src/demos/Windows/bounce.dsp | 112
src/demos/Windows/clearspd.dsp | 112
src/demos/Windows/cubemap.dsp | 112
src/demos/Windows/demos.dsw | 782 -
src/demos/Windows/drawpix.dsp | 112
src/demos/Windows/fire.dsp | 112
src/demos/Windows/gears.dsp | 112
src/demos/Windows/geartrain.dsp | 112
src/demos/Windows/glinfo.dsp | 112
src/demos/Windows/gloss.dsp | 112
src/demos/Windows/gltestperf.dsp | 112
src/demos/Windows/glutfx.dsp | 112
src/demos/Windows/ipers.dsp | 112
src/demos/Windows/isosurf.dsp | 112
src/demos/Windows/loadbias.dsp | 112
src/demos/Windows/morph3d.dsp | 112
src/demos/Windows/multiarb.dsp | 112
src/demos/Windows/occlude.dsp | 112
src/demos/Windows/osdemo.dsp | 112
src/demos/Windows/paltex.dsp | 112
src/demos/Windows/pixeltex.dsp | 112
src/demos/Windows/pointblast.dsp | 112
src/demos/Windows/rain.dsp | 112
src/demos/Windows/ray.dsp | 112
src/demos/Windows/readpix.dsp | 112
src/demos/Windows/reflect.dsp | 112
src/demos/Windows/renormal.dsp | 112
src/demos/Windows/shadowtex.dsp | 112
src/demos/Windows/spectex.dsp | 112
src/demos/Windows/spriteblast.dsp | 112
src/demos/Windows/stex3d.dsp | 112
src/demos/Windows/teapot.dsp | 112
src/demos/Windows/terrain.dsp | 112
src/demos/Windows/tessdemo.dsp | 112
src/demos/Windows/texcyl.dsp | 112
src/demos/Windows/texdown.dsp | 112
src/demos/Windows/texenv.dsp | 112
src/demos/Windows/texobj.dsp | 112
src/demos/Windows/trispd.dsp | 112
src/demos/Windows/tunnel.dsp | 112
src/demos/Windows/tunnel2.dsp | 112
src/demos/Windows/winpos.dsp | 112
src/demos/arbfplight.c | 2
src/demos/arbfslight.c | 403
src/demos/arbocclude.c | 2
src/demos/arbocclude2.c | 6
src/demos/bounce.c | 2
src/demos/clearspd.c | 2
src/demos/copypix.c | 4
src/demos/cubemap.c | 4
src/demos/cuberender.c | 586
src/demos/dinoshade.c | 18
src/demos/dissolve.c | 6
src/demos/drawpix.c | 4
src/demos/engine.c | 4
src/demos/fbo_firecube.c | 9
src/demos/fbotexture.c | 2
src/demos/fire.c | 10
src/demos/fogcoord.c | 2
src/demos/fplight.c | 2
src/demos/fslight.c | 8
src/demos/gamma.c | 2
src/demos/gearbox.c | 2
src/demos/gears.c | 2
src/demos/geartrain.c | 4
src/demos/geartrain.dat | 119
src/demos/glinfo.c | 15
src/demos/gloss.c | 6
src/demos/gltestperf.c | 2
src/demos/ipers.c | 7
src/demos/isosurf.c | 36
src/demos/isosurf.dat | 7179 ----------
src/demos/lodbias.c | 4
src/demos/morph3d.c | 2
src/demos/multiarb.c | 6
src/demos/normal.c | 596
src/demos/paltex.c | 2
src/demos/particles.h | 2
src/demos/pixeltest.c | 3
src/demos/pointblast.c | 2
src/demos/projtex.c | 10
src/demos/rain.cxx | 5
src/demos/ray.c | 2
src/demos/readpix.c | 4
src/demos/reflect.c | 4
src/demos/renormal.c | 2
src/demos/shadowtex.c | 2
src/demos/singlebuffer.c | 2
src/demos/spectex.c | 2
src/demos/spriteblast.c | 5
src/demos/stex3d.c | 2
src/demos/teapot.c | 6
src/demos/terrain.c | 4
src/demos/terrain.dat | 1
src/demos/tessdemo.c | 2
src/demos/texcyl.c | 4
src/demos/texenv.c | 2
src/demos/textures.c | 10
src/demos/trispd.c | 2
src/demos/tunnel.c | 6
src/demos/tunnel2.c | 6
src/demos/vao_demo.c | 2
src/demos/winpos.c | 4
src/egl/CMakeLists.txt | 20
src/egl/Makefile.am | 3
src/egl/eglut/CMakeLists.txt | 22
src/egl/eglut/Makefile.am | 15
src/egl/eglut/eglut_screen.c | 1
src/egl/eglut/eglut_wayland.c | 135
src/egl/oes_vg/.gitignore | 2
src/egl/oes_vg/CMakeLists.txt | 20
src/egl/oes_vg/Makefile.am | 48
src/egl/oes_vg/tex2vgimage.c | 428
src/egl/oes_vg/vgimage2tex.c | 425
src/egl/opengl/CMakeLists.txt | 62
src/egl/opengl/Makefile.am | 6
src/egl/opengl/demo2.c | 2
src/egl/opengl/demo3.c | 2
src/egl/opengl/eglgears.c | 2
src/egl/opengl/eglkms.c | 196
src/egl/opengl/eglscreen.c | 2
src/egl/opengl/egltri.c | 2
src/egl/opengl/peglgears.c | 3
src/egl/opengl/xeglgears.c | 39
src/egl/opengl/xeglthreads.c | 2
src/egl/opengles1/.gitignore | 9
src/egl/opengles1/CMakeLists.txt | 62
src/egl/opengles1/Makefile.am | 1
src/egl/opengles1/drawtex.c | 2
src/egl/opengles1/eglfbdev.c | 338
src/egl/opengles1/es1_info.c | 17
src/egl/opengles1/msaa.c | 2
src/egl/opengles1/texture_from_pixmap.c | 27
src/egl/opengles2/.gitignore | 4
src/egl/opengles2/CMakeLists.txt | 40
src/egl/opengles2/Makefile.am | 17
src/egl/opengles2/es2gears.c | 4
src/egl/opengles2/es2tri.c | 11
src/egl/openvg/CMakeLists.txt | 44
src/egl/openvg/trivial/CMakeLists.txt | 50
src/egl/openvg/trivial/blend.c | 1
src/egl/openvg/trivial/eglcommon.c | 6
src/egl/openvg/trivial/eglcommon.h | 4
src/fbdev/.gitignore | 1
src/fbdev/Makefile | 55
src/fbdev/glfbdevtest.c | 599
src/fp/CMakeLists.txt | 4
src/fp/fp-tri.c | 8
src/fp/point-position.c | 2
src/fp/tri-depth.c | 2
src/fp/tri-depth2.c | 2
src/fp/tri-depthwrite.c | 2
src/fp/tri-depthwrite2.c | 2
src/fp/tri-param.c | 2
src/fp/tri-tex.c | 4
src/fpglsl/CMakeLists.txt | 4
src/fpglsl/depth-read.glsl | 4
src/fpglsl/fp-tri.c | 6
src/fpglsl/infinite-loop.glsl | 7
src/glsl/.gitignore | 8
src/glsl/CMakeLists.txt | 69
src/glsl/Makefile.am | 14
src/glsl/array.c | 2
src/glsl/bezier.c | 7
src/glsl/bitmap.c | 2
src/glsl/blinking-teapot.c | 177
src/glsl/blinking-teapot.frag | 31
src/glsl/blinking-teapot.vert | 16
src/glsl/brick.c | 2
src/glsl/bump.c | 4
src/glsl/convolutions.c | 4
src/glsl/deriv.c | 2
src/glsl/fragcoord.c | 2
src/glsl/fsraytrace.c | 14
src/glsl/geom-outlining-130.c | 302
src/glsl/geom-outlining-150.c | 380
src/glsl/geom-sprites.c | 307
src/glsl/geom-stipple-lines.c | 323
src/glsl/geom-wide-lines.c | 319
src/glsl/identity.c | 99
src/glsl/linktest.c | 2
src/glsl/mandelbrot.c | 2
src/glsl/multinoise.c | 6
src/glsl/multitex.c | 12
src/glsl/multitex.shtest | 4
src/glsl/noise.c | 2
src/glsl/noise2.c | 188
src/glsl/pointcoord.c | 2
src/glsl/points.c | 2
src/glsl/samplers.c | 2
src/glsl/shadow_sampler.c | 8
src/glsl/shtest.c | 42
src/glsl/simplex-noise.c | 235
src/glsl/simplex-noise.glsl | 279
src/glsl/skinning.c | 2
src/glsl/texaaline.c | 9
src/glsl/texdemo1.c | 4
src/glsl/toyball.c | 2
src/glsl/trirast.c | 3
src/glsl/twoside.c | 2
src/glsl/vert-or-frag-only.c | 2
src/glsl/vert-tex.c | 2
src/glsl/vsraytrace.c | 14
src/gs/CMakeLists.txt | 4
src/gs/gs-tri.c | 2
src/images/CMakeLists.txt | 3
src/images/Makefile.am | 35
src/objviewer/.gitignore | 1
src/objviewer/CMakeLists.txt | 4
src/objviewer/glmdraw.c | 7
src/objviewer/objview.c | 17
src/objviewer/skybox.c | 1
src/osdemos/osdemo.c | 2
src/osdemos/osdemo16.c | 2
src/osdemos/osdemo32.c | 2
src/osdemos/ostest1.c | 1
src/perf/.gitignore | 1
src/perf/CMakeLists.txt | 4
src/perf/Makefile.am | 12
src/perf/glmain.c | 12
src/perf/glslstateschange.c | 10
src/redbook/CMakeLists.txt | 4
src/redbook/Makefile.am | 12
src/redbook/Makefile.win | 78
src/redbook/Windows/redbook.dsw | 29
src/redbook/Windows/teapots.dsp | 112
src/redbook/aaindex.c | 2
src/redbook/aapoly.c | 2
src/redbook/aargb.c | 2
src/redbook/accanti.c | 2
src/redbook/accpersp.c | 2
src/redbook/alpha.c | 2
src/redbook/alpha3D.c | 2
src/redbook/anti.c | 2
src/redbook/bezcurve.c | 2
src/redbook/bezmesh.c | 2
src/redbook/checker.c | 2
src/redbook/clip.c | 2
src/redbook/colormat.c | 2
src/redbook/combiner.c | 2
src/redbook/convolution.c | 2
src/redbook/cube.c | 2
src/redbook/cubemap.c | 2
src/redbook/depthcue.c | 2
src/redbook/dof.c | 2
src/redbook/double.c | 2
src/redbook/drawf.c | 2
src/redbook/feedback.c | 2
src/redbook/fog.c | 2
src/redbook/fogcoord.c | 2
src/redbook/fogindex.c | 2
src/redbook/font.c | 2
src/redbook/hello.c | 2
src/redbook/histogram.c | 2
src/redbook/image.c | 2
src/redbook/light.c | 2
src/redbook/lines.c | 2
src/redbook/list.c | 2
src/redbook/material.c | 2
src/redbook/minmax.c | 2
src/redbook/mipmap.c | 2
src/redbook/model.c | 2
src/redbook/movelight.c | 2
src/redbook/multisamp.c | 2
src/redbook/multitex.c | 2
src/redbook/mvarray.c | 2
src/redbook/nurbs.c | 2
src/redbook/pickdepth.c | 2
src/redbook/picksquare.c | 2
src/redbook/plane.c | 2
src/redbook/planet.c | 2
src/redbook/pointp.c | 2
src/redbook/polyoff.c | 2
src/redbook/polys.c | 7
src/redbook/quadric.c | 2
src/redbook/robot.c | 2
src/redbook/sccolorlight.c | 2
src/redbook/scene.c | 2
src/redbook/scenebamb.c | 2
src/redbook/sceneflat.c | 2
src/redbook/select.c | 2
src/redbook/shadowmap.c | 2
src/redbook/smooth.c | 2
src/redbook/stencil.c | 2
src/redbook/stroke.c | 2
src/redbook/surface.c | 2
src/redbook/surfpoints.c | 2
src/redbook/teaambient.c | 2
src/redbook/teapots.c | 2
src/redbook/tess.c | 2
src/redbook/tesswind.c | 2
src/redbook/texbind.c | 2
src/redbook/texgen.c | 2
src/redbook/texprox.c | 2
src/redbook/texsub.c | 2
src/redbook/texture3d.c | 2
src/redbook/texturesurf.c | 2
src/redbook/torus.c | 2
src/redbook/trim.c | 2
src/redbook/unproject.c | 2
src/redbook/varray.c | 2
src/redbook/wrap.c | 2
src/samples/CMakeLists.txt | 36
src/samples/Makefile.win | 41
src/samples/accum.c | 2
src/samples/bitmap1.c | 2
src/samples/bitmap2.c | 2
src/samples/blendeq.c | 2
src/samples/blendxor.c | 2
src/samples/copy.c | 2
src/samples/cursor.c | 2
src/samples/depth.c | 2
src/samples/eval.c | 2
src/samples/fog.c | 2
src/samples/font.c | 2
src/samples/line.c | 2
src/samples/logo.c | 2
src/samples/nurb.c | 2
src/samples/oglinfo.c | 1
src/samples/olympic.c | 2
src/samples/overlay.c | 2
src/samples/point.c | 2
src/samples/prim.c | 2
src/samples/quad.c | 2
src/samples/rgbtoppm.c | 2
src/samples/select.c | 2
src/samples/shape.c | 2
src/samples/sphere.c | 4
src/samples/star.c | 2
src/samples/stencil.c | 2
src/samples/stretch.c | 2
src/samples/texture.c | 2
src/samples/tri.c | 2
src/samples/wave.c | 2
src/slang/CMakeLists.txt | 34
src/slang/Makefile.am | 3
src/slang/framework.c | 80
src/slang/framework.h | 66
src/slang/sotest.c | 4
src/slang/vstest.c | 8
src/slang/windows/vc60/cltest.dsp | 94
src/slang/windows/vc60/framework.dsp | 92
src/slang/windows/vc60/slang.dsw | 74
src/slang/windows/vc60/sotest.dsp | 90
src/slang/windows/vc60/vstest.dsp | 93
src/tests/.gitignore | 8
src/tests/CMakeLists.txt | 49
src/tests/Makefile.am | 10
src/tests/Makefile.win | 43
src/tests/afsmultiarb.c | 6
src/tests/antialias.c | 2
src/tests/api_speed.c | 2
src/tests/arbfpspec.c | 2
src/tests/arbfptest1.c | 2
src/tests/arbfptexture.c | 4
src/tests/arbfptrig.c | 4
src/tests/arbgpuprog.c | 2
src/tests/arbnpot-mipmap.c | 2
src/tests/arbnpot.c | 4
src/tests/arbvparray.c | 302
src/tests/arbvptest1.c | 2
src/tests/arbvptest3.c | 2
src/tests/arbvptorus.c | 2
src/tests/arbvpwarpmesh.c | 2
src/tests/arraytexture.c | 20
src/tests/blendxor.c | 4
src/tests/blitfb.c | 2
src/tests/bufferobj.c | 12
src/tests/bug_3050.c | 2
src/tests/bug_3101.c | 2
src/tests/bug_3195.c | 4
src/tests/bug_texstore_i8.c | 2
src/tests/bumpmap.c | 4
src/tests/calibrate_rast.c | 2
src/tests/clip.c | 199
src/tests/condrender.c | 2
src/tests/copypixrate.c | 2
src/tests/cva.c | 18
src/tests/cva_huge.c | 2
src/tests/cylwrap.c | 2
src/tests/debugger.c | 2
src/tests/drawbuffers.c | 9
src/tests/drawbuffers2.c | 5
src/tests/drawstencil.c | 224
src/tests/exactrast.c | 2
src/tests/ext422square.c | 4
src/tests/fbotest1.c | 2
src/tests/fbotest2.c | 2
src/tests/fbotest3.c | 2
src/tests/fillrate.c | 6
src/tests/floattex.c | 4
src/tests/fogcoord.c | 2
src/tests/fptest1.c | 2
src/tests/fptexture.c | 4
src/tests/getteximage.c | 2
src/tests/glutfx.c | 2
src/tests/gremedy.c | 156
src/tests/interleave.c | 2
src/tests/invert.c | 4
src/tests/lineclip.c | 2
src/tests/linehacks.c | 330
src/tests/manytex.c | 2
src/tests/mapbufrange.c | 2
src/tests/minmag.c | 2
src/tests/mipgen.c | 2
src/tests/mipmap_comp.c | 2
src/tests/mipmap_comp_tests.c | 2
src/tests/mipmap_limits.c | 124
src/tests/mipmap_tunnel.c | 30
src/tests/mipmap_view.c | 4
src/tests/multipal.c | 6
src/tests/multitexarray.c | 2
src/tests/multiwindow.c | 2
src/tests/no_s3tc.c | 2
src/tests/occlude.c | 234
src/tests/packedpixels.c | 2
src/tests/pbo.c | 4
src/tests/persp_hint.c | 2
src/tests/prim.c | 2
src/tests/prog_parameter.c | 2
src/tests/quads.c | 2
src/tests/random.c | 2
src/tests/readrate.c | 2
src/tests/rubberband.c | 7
src/tests/scissor-viewport.c | 2
src/tests/scissor.c | 2
src/tests/seccolor.c | 2
src/tests/shader-interp.c | 213
src/tests/shader_api.c | 7
src/tests/shadow-sample.c | 319
src/tests/stencilreaddraw.c | 2
src/tests/stencilwrap.c | 2
src/tests/step.c | 2
src/tests/streaming_rect.c | 2
src/tests/subtex.c | 2
src/tests/subtexrate.c | 2
src/tests/tex1d.c | 2
src/tests/texcmp.c | 4
src/tests/texcompress2.c | 4
src/tests/texcompsub.c | 2
src/tests/texdown.c | 2
src/tests/texfilt.c | 2
src/tests/texgenmix.c | 2
src/tests/texleak.c | 2
src/tests/texline.c | 4
src/tests/texobj.c | 2
src/tests/texrect.c | 6
src/tests/texwrap.c | 354
src/tests/unfilledclip.c | 2
src/tests/viewmemory.c | 208
src/tests/vparray.c | 8
src/tests/vpeval.c | 2
src/tests/vptest1.c | 2
src/tests/vptest2.c | 2
src/tests/vptest3.c | 2
src/tests/vptorus.c | 2
src/tests/vpwarpmesh.c | 2
src/tests/yuvrect.c | 4
src/tests/yuvsquare.c | 4
src/tests/zbitmap.c | 2
src/tests/zcomp.c | 2
src/tests/zdrawpix.c | 2
src/tests/zreaddraw.c | 2
src/tools/trace/gltrace.py | 1
src/trivial/.gitignore | 47
src/trivial/CMakeLists.txt | 11
src/trivial/Makefile.am | 12
src/trivial/clear-color.c | 2
src/trivial/clear-fbo-scissor.c | 3
src/trivial/clear-fbo-tex.c | 4
src/trivial/clear-fbo.c | 108
src/trivial/clear-random.c | 2
src/trivial/clear-repeat.c | 2
src/trivial/clear-scissor.c | 2
src/trivial/clear-undefined.c | 2
src/trivial/createwin.c | 2
src/trivial/dlist-begin-call-end.c | 2
src/trivial/dlist-dangling.c | 2
src/trivial/dlist-degenerate.c | 2
src/trivial/dlist-edgeflag-dangling.c | 2
src/trivial/dlist-edgeflag.c | 2
src/trivial/dlist-flat-tri.c | 2
src/trivial/dlist-mat-tri.c | 2
src/trivial/dlist-recursive-call.c | 2
src/trivial/dlist-tri-flat-tri.c | 2
src/trivial/dlist-tri-mat-tri.c | 2
src/trivial/draw2arrays.c | 2
src/trivial/drawarrays.c | 2
src/trivial/drawelements-large.c | 2
src/trivial/drawelements.c | 2
src/trivial/drawrange.c | 2
src/trivial/flat-clip.c | 2
src/trivial/fs-tri.c | 8
src/trivial/line-clip.c | 2
src/trivial/line-cull.c | 2
src/trivial/line-flat.c | 2
src/trivial/line-smooth.c | 12
src/trivial/line-stipple-wide.c | 2
src/trivial/line-userclip-clip.c | 2
src/trivial/line-userclip-nop-clip.c | 2
src/trivial/line-userclip-nop.c | 2
src/trivial/line-userclip.c | 2
src/trivial/line-wide.c | 2
src/trivial/line-xor.c | 2
src/trivial/line.c | 2
src/trivial/lineloop-clip.c | 2
src/trivial/lineloop-elts.c | 2
src/trivial/lineloop.c | 2
src/trivial/linestrip-clip.c | 2
src/trivial/linestrip-flat-stipple.c | 2
src/trivial/linestrip-stipple-wide.c | 2
src/trivial/linestrip-stipple.c | 2
src/trivial/linestrip.c | 2
src/trivial/long-fixed-func.c | 2
src/trivial/pgon-mode.c | 2
src/trivial/point-clip.c | 2
src/trivial/point-param.c | 2
src/trivial/point-sprite.c | 149
src/trivial/point-wide-smooth.c | 2
src/trivial/point-wide.c | 2
src/trivial/point.c | 2
src/trivial/poly-flat-clip.c | 2
src/trivial/poly-flat-unfilled-clip.c | 2
src/trivial/poly-flat.c | 2
src/trivial/poly-unfilled.c | 2
src/trivial/poly.c | 2
src/trivial/quad-clip-all-vertices.c | 2
src/trivial/quad-clip-nearplane.c | 2
src/trivial/quad-clip.c | 2
src/trivial/quad-degenerate.c | 2
src/trivial/quad-flat.c | 2
src/trivial/quad-offset-factor.c | 2
src/trivial/quad-offset-unfilled.c | 2
src/trivial/quad-offset-units.c | 2
src/trivial/quad-tex-2d.c | 2
src/trivial/quad-tex-3d.c | 2
src/trivial/quad-tex-alpha.c | 2
src/trivial/quad-tex-pbo.c | 2
src/trivial/quad-tex-sub.c | 2
src/trivial/quad-unfilled-clip.c | 2
src/trivial/quad-unfilled-stipple.c | 2
src/trivial/quad-unfilled.c | 2
src/trivial/quad.c | 2
src/trivial/quads.c | 2
src/trivial/quadstrip-clip.c | 2
src/trivial/quadstrip-cont.c | 2
src/trivial/quadstrip-flat.c | 2
src/trivial/quadstrip.c | 2
src/trivial/readpixels.c | 2
src/trivial/sub-tex.c | 2
src/trivial/tex-quads.c | 2
src/trivial/tri-2101010-dlist.c | 174
src/trivial/tri-2101010.c | 163
src/trivial/tri-alpha-tex.c | 4
src/trivial/tri-alpha.c | 4
src/trivial/tri-array-interleaved.c | 2
src/trivial/tri-blend-color.c | 4
src/trivial/tri-blend-max.c | 2
src/trivial/tri-blend-min.c | 2
src/trivial/tri-blend-revsub.c | 2
src/trivial/tri-blend-sub.c | 2
src/trivial/tri-blend.c | 4
src/trivial/tri-clear.c | 4
src/trivial/tri-clip.c | 4
src/trivial/tri-cull-both.c | 2
src/trivial/tri-cull.c | 4
src/trivial/tri-dlist.c | 2
src/trivial/tri-edgeflag-array.c | 2
src/trivial/tri-edgeflag-pv.c | 150
src/trivial/tri-edgeflag.c | 2
src/trivial/tri-fbo-tex-mip.c | 2
src/trivial/tri-fbo-tex.c | 2
src/trivial/tri-fbo.c | 2
src/trivial/tri-flat-clip.c | 2
src/trivial/tri-flat.c | 2
src/trivial/tri-fog.c | 2
src/trivial/tri-fp-const-imm.c | 2
src/trivial/tri-fp.c | 2
src/trivial/tri-lit-material.c | 2
src/trivial/tri-lit.c | 2
src/trivial/tri-logicop-none.c | 2
src/trivial/tri-logicop-xor.c | 2
src/trivial/tri-mask-tri.c | 2
src/trivial/tri-multitex-vbo.c | 2
src/trivial/tri-orig.c | 2
src/trivial/tri-point-line-clipped.c | 2
src/trivial/tri-query.c | 2
src/trivial/tri-repeat.c | 2
src/trivial/tri-scissor-tri.c | 2
src/trivial/tri-square.c | 2
src/trivial/tri-stencil.c | 2
src/trivial/tri-stipple.c | 2
src/trivial/tri-tex-1d.c | 2
src/trivial/tri-tex-3d.c | 2
src/trivial/tri-tex.c | 4
src/trivial/tri-tri.c | 4
src/trivial/tri-unfilled-clip.c | 2
src/trivial/tri-unfilled-edgeflag.c | 2
src/trivial/tri-unfilled-fog.c | 2
src/trivial/tri-unfilled-point.c | 2
src/trivial/tri-unfilled-smooth.c | 2
src/trivial/tri-unfilled-tri-lit.c | 2
src/trivial/tri-unfilled-tri.c | 2
src/trivial/tri-unfilled-userclip-stip.c | 2
src/trivial/tri-unfilled-userclip.c | 2
src/trivial/tri-unfilled.c | 2
src/trivial/tri-userclip.c | 2
src/trivial/tri-viewport.c | 2
src/trivial/tri-z-9.c | 2
src/trivial/tri-z-clip.c | 77
src/trivial/tri-z-eq.c | 2
src/trivial/tri-z.c | 2
src/trivial/tri.c | 2
src/trivial/trifan-flat-clip.c | 2
src/trivial/trifan-flat-unfilled-clip.c | 2
src/trivial/trifan-flat.c | 2
src/trivial/trifan-unfilled.c | 2
src/trivial/trifan.c | 4
src/trivial/tristrip-clip.c | 2
src/trivial/tristrip-flat.c | 2
src/trivial/tristrip.c | 2
src/trivial/vbo-drawarrays-2101010.c | 190
src/trivial/vbo-drawarrays.c | 2
src/trivial/vbo-drawelements.c | 2
src/trivial/vbo-drawrange.c | 2
src/trivial/vbo-noninterleaved.c | 2
src/trivial/vbo-tri.c | 2
src/trivial/vp-array-hf.c | 2
src/trivial/vp-array-int.c | 2
src/trivial/vp-array.c | 2
src/trivial/vp-clip.c | 2
src/trivial/vp-line-clip.c | 2
src/trivial/vp-tri-cb-pos.c | 2
src/trivial/vp-tri-cb-tex.c | 2
src/trivial/vp-tri-cb.c | 2
src/trivial/vp-tri-imm.c | 2
src/trivial/vp-tri-invariant.c | 2
src/trivial/vp-tri-swap.c | 2
src/trivial/vp-tri-tex.c | 2
src/trivial/vp-tri.c | 2
src/trivial/vp-unfilled.c | 2
src/util/CMakeLists.txt | 6
src/util/Makefile.am | 7
src/util/dumpstate.c | 4
src/util/errcheck.c | 3
src/util/extfuncs.h | 277
src/util/gl_wrap.h | 16
src/util/glstate.c | 4
src/util/glstate.h | 2
src/util/glut_wrap.h | 14
src/util/glutskel.c | 2
src/util/readtex.c | 3
src/util/readtex.h | 2
src/util/shaderutil.c | 28
src/util/shaderutil.h | 7
src/util/showbuffer.c | 2
src/util/showbuffer.h | 2
src/vp/CMakeLists.txt | 4
src/vp/vp-tris.c | 5
src/vp/windows/vp2003.sln | 21
src/vp/windows/vp2003.vcproj | 121
src/vpglsl/CMakeLists.txt | 4
src/vpglsl/infinite-loop.glsl | 8
src/vpglsl/vp-tris.c | 2
src/wgl/CMakeLists.txt | 3
src/wgl/wglcontext.c | 273
src/wgl/wglinfo.c | 260
src/xdemos/.gitignore | 3
src/xdemos/CMakeLists.txt | 16
src/xdemos/glsync.c | 1
src/xdemos/glthreads.c | 18
src/xdemos/glxcontexts.c | 7
src/xdemos/glxgears.c | 85
src/xdemos/glxgears_fbconfig.c | 7
src/xdemos/glxgears_pixmap.c | 7
src/xdemos/glxinfo.c | 766 -
src/xdemos/glxsnoop.c | 6
src/xdemos/glxswapcontrol.c | 7
src/xdemos/msctest.c | 1
src/xdemos/multictx.c | 6
src/xdemos/omlsync.c | 1
src/xdemos/overlay.c | 8
src/xdemos/yuvrect_client.c | 2
721 files changed, 18856 insertions(+), 17641 deletions(-)
New commits:
commit b8dbde3de365ab3645aa57f68b00356f44475e83
Author: Robert Hooker <sarvatt@ubuntu.com>
Date: Wed May 1 21:32:39 2013 -0400
Install es2gears_screen and es2gears_x11 in mesa-utils-extra
diff --git a/debian/mesa-utils-extra.install b/debian/mesa-utils-extra.install
index 4592e03..c57c567 100644
--- a/debian/mesa-utils-extra.install
+++ b/debian/mesa-utils-extra.install
@@ -1,3 +1,4 @@
usr/bin/es2_info
-usr/bin/es2gears
+usr/bin/es2gears_screen
+usr/bin/es2gears_x11
usr/bin/es2tri
commit bc3b04a7e306eb3a01a9bd162f44d1cdc9cb0200
Author: Robert Hooker <sarvatt@ubuntu.com>
Date: Wed May 1 21:27:22 2013 -0400
Drop upstream patch, bump changelog.
diff --git a/debian/changelog b/debian/changelog
index b171fad..a3cc94c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+mesa-demos (8.1.0-0ubuntu1) UNRELEASED; urgency=low
+
+ * Merge unreleased debian git:
+ - New upstream release (LP: #1135464)
+ * Added package mesa-utils-extra containing the EGL/GLES2 demos
+ * debian/patches/properly_defining_default_precision_es2gears.patch:
+ - Dropped, upstream.
+
+ -- Robert Hooker <sarvatt@ubuntu.com> Wed, 01 May 2013 21:23:58 -0400
+
mesa-demos (8.1.0-1) UNRELEASED; urgency=low
* New upstream release (Closes: #706022).
diff --git a/debian/control b/debian/control
index e46946d..13fca36 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,6 @@ Priority: optional
Maintainer: Ubuntu X-SWAT <ubuntu-x@lists.ubuntu.com>
Standards-Version: 3.9.1
Build-Depends: debhelper (>= 7.2.7),
- quilt,
pkg-config,
autoconf,
automake,
diff --git a/debian/patches/properly_defining_default_precision_es2gears.patch b/debian/patches/properly_defining_default_precision_es2gears.patch
deleted file mode 100644
index 4374885..0000000
--- a/debian/patches/properly_defining_default_precision_es2gears.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From: Ricardo Salveti de Araujo <ricardo.salveti@canonical.com>
-Date: Thu, 3 Feb 2011 18:35:24 -0200
-Subject: [PATCH] Properly defining default precision in es2gears fragment shader.
-
-Bug: https://bugs.freedesktop.org/show_bug.cgi?id=29279
-
-Signed-off-by: Ricardo Salveti de Araujo <ricardo.salveti@canonical.com>
----
- src/egl/opengles2/es2gears.c | 4 +---
- 1 files changed, 1 insertions(+), 3 deletions(-)
-
-diff --git a/src/egl/opengles2/es2gears.c b/src/egl/opengles2/es2gears.c
-index 0018ea9..37fb6a4 100644
---- a/src/egl/opengles2/es2gears.c
-+++ b/src/egl/opengles2/es2gears.c
-@@ -607,9 +607,6 @@ gears_idle(void)
- }
-
- static const char vertex_shader[] =
--"#ifdef GL_ES\n"
--"precision mediump float;\n"
--"#endif\n"
- "attribute vec3 position;\n"
- "attribute vec3 normal;\n"
- "\n"
-@@ -638,6 +635,7 @@ static const char vertex_shader[] =
- "}";
-
- static const char fragment_shader[] =
-+"precision mediump float;\n"
- "varying vec4 Color;\n"
- "\n"
- "void main(void)\n"
---
-1.7.2.3
-
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 19a4235..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-properly_defining_default_precision_es2gears.patch
commit c08ffee97b7c79ca708c9aaf898775a2b900a482
Author: Sven Joachim <svenjoac@gmx.de>
Date: Wed Apr 24 18:21:30 2013 +0200
Remove directory src/wgl/rtotex
There are a bunch of other files not shipped in the 8.1.0 tarball, but
since those do not cause dpkg-source to fail, I leave them in for now.
diff --git a/src/wgl/rtotex/CMakeLists.txt b/src/wgl/rtotex/CMakeLists.txt
deleted file mode 100644
index ba5e5e6..0000000
--- a/src/wgl/rtotex/CMakeLists.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-include_directories (
- ${OPENGL_INCLUDE_PATH}
- ${GLUT_INCLUDE_DIR}
- ${GLEW_INCLUDE_DIR}
-)
-
-link_libraries (
- ${OPENGL_gl_LIBRARY}
- ${OPENGL_glu_LIBRARY}
- ${GLUT_glut_LIBRARY}
- ${GLEW_glew_LIBRARY}
-)
-
-add_executable (rtotex WIN32
- fps_counter.cpp
- image.cpp
- interactor.cpp
- log.cpp
- main.cpp
- pbuffer.cpp
- timer.cpp
- window.cpp
- maths/color.cpp
- maths/matrix4x4.cpp
- maths/plane.cpp
- maths/vector2d.cpp
- maths/vector3d.cpp
- maths/vector4d.cpp
-)
-
-install (TARGETS rtotex DESTINATION wgl/rtotex)
-
-install (FILES decal.bmp DESTINATION wgl/rtotex)
-
diff --git a/src/wgl/rtotex/LICENSE.txt b/src/wgl/rtotex/LICENSE.txt
deleted file mode 100644
index b6cd6a5..0000000
--- a/src/wgl/rtotex/LICENSE.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-Copyright (c) 2006, Paul Baker
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
- * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
- * Neither the name of paulsprojects.net nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/src/wgl/rtotex/README.txt b/src/wgl/rtotex/README.txt
deleted file mode 100644
index 3d92b18..0000000
--- a/src/wgl/rtotex/README.txt
+++ /dev/null
@@ -1,55 +0,0 @@
-**************************************************************************
-** Render to texture
-**
-** www.paulsprojects.net
-**
-** paul@paulsprojects.net
-**************************************************************************
-
-Description:
-
-This is my first use of pbuffers. It is a simple project which creates a render-to-texture-enabled pbuffer, and a texture object related to it. When rendering, the pbuffer is made the current context, and two wire tori are rendered into it. The window is then made current, and the pbuffer is used to texture a single rectangle. The camera can be moved around this rectangle.
-
-If the SGIS_generate_mipmap extension is supported, it is used to automatically generate mipmaps for the texture each time it is updated, and a LINEAR_MIPMAP_LINEAR filter is used. Otherwise, a LINEAR filter is used.
-
-If anisotropic filtering is supported, the maximum degree of anisotropy is enabled at start-up. The anisotropy level can be altered to show the difference this filtering has on the textured quad.
-
-It is also possible to render a second scene into the pbuffer, a textured teapot instead of the wire torus. This demonstrates rendering using textures in the pbuffer, then using the pbuffer image itself as a texture. The important thing to note here is that the texture object which will use the pbuffer image is part of the window context. The image on the teapot is part of the pbuffer context. It is important to load the image when the pbuffer context is current since in this demo, the two contexts do not share textures.
-
-
-Requirements:
-
-WGL_ARB_extensions_string
-WGL_ARB_pbuffer
-WGL_ARB_pixel_format
-WGL_ARB_render_texture
-
-Optional:
-
-EXT_texture_filter_anisotropic
-SGIS_generate_mipmap
-
-
-References:
-
-"Using pbuffers for off-screen rendering", Chris Wynn. From developer.nvidia.com
-"OpenGL Render-to-Texture", Chris Wynn. From developer.nvidia.com
-Extension specifications for the above WGL extensions.
-
-
-Keys:
-
-F1 - Take a screenshot
-Escape - Quit
-
-1 - Draw wire torus shape
-2 - Draw textured teapot
-
-Up - Increase texture max anisotropy (if anisotropic filtering is supported)
-Down - Decrease texture max anisotropy (if anisotropic filtering is supported)
-
-M - Use LINEAR_MIPMAP_LINEAR filtering, if SGIS_generate_mipmap is supported
-L - Use LINEAR filtering
-
-P - Pause
-U - Unpause
diff --git a/src/wgl/rtotex/decal.bmp b/src/wgl/rtotex/decal.bmp
deleted file mode 100644
index b54edf4..0000000
Binary files a/src/wgl/rtotex/decal.bmp and /dev/null differ
diff --git a/src/wgl/rtotex/fps_counter.cpp b/src/wgl/rtotex/fps_counter.cpp
deleted file mode 100644
index b518ce6..0000000
--- a/src/wgl/rtotex/fps_counter.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-//////////////////////////////////////////////////////////////////////////////////////////
-// FPS_COUNTER.cpp
-// functions to calculate frames per second
-// Downloaded from: www.paulsprojects.net
-// Created: 20th July 2002
-//
-// Copyright (c) 2006, Paul Baker
-// Distributed under the New BSD Licence. (See accompanying file License.txt or copy at
-// http://www.paulsprojects.net/NewBSDLicense.txt)
-//////////////////////////////////////////////////////////////////////////////////////////
-#include <windows.h>
-#include "log.h"
-#include "fps_counter.h"
-
-extern LOG errorLog;
-
-void FPS_COUNTER::Update(void)
-{
- //keep track of time lapse and frame count
- time = timeGetTime()*0.001f; //get current time in seconds
- ++frames; //increase frame count
-
- if(time-lastTime>1.0f) //if it has been 1 second
- {
- fps = frames/(time-lastTime); //update fps number
- lastTime= time; //set beginning count
- frames = 0L; //reset frames this second
- }
-}
diff --git a/src/wgl/rtotex/fps_counter.h b/src/wgl/rtotex/fps_counter.h
deleted file mode 100644
index c9114f8..0000000
--- a/src/wgl/rtotex/fps_counter.h
+++ /dev/null
@@ -1,34 +0,0 @@
-//////////////////////////////////////////////////////////////////////////////////////////
-// FPS_COUNTER.h