mesa-demos: Changes to 'ubuntu'
.gitignore | 5
CMakeLists.txt | 52
SConstruct | 144
bin/confdiff.sh | 48
bin/config.guess | 1555 -
bin/config.sub | 1685 -
bin/installmesa | 74
bin/minstall | 93
bin/mklib | 1027
bin/version.mk | 17
common.py | 64
configs/.gitignore | 2
configs/aix | 30
configs/aix-64 | 27
configs/aix-64-static | 25
configs/aix-gcc | 23
configs/aix-static | 25
configs/autoconf.in | 184
configs/beos | 104
configs/bluegene-osmesa | 33
configs/bluegene-xlc-osmesa | 29
configs/catamount-osmesa-pgi | 32
configs/config.mgw | 42
configs/darwin | 60
configs/darwin-fat-32bit | 7
configs/darwin-fat-all | 7
configs/default | 155
configs/freebsd | 31
configs/freebsd-dri | 52
configs/freebsd-dri-amd64 | 10
configs/freebsd-dri-x86 | 13
configs/hpux10 | 14
configs/hpux10-gcc | 20
configs/hpux10-static | 30
configs/hpux11-32 | 30
configs/hpux11-32-static | 27
configs/hpux11-32-static-nothreads | 26
configs/hpux11-64 | 31
configs/hpux11-64-static | 27
configs/hpux11-ia64 | 30
configs/hpux11-ia64-static | 27
configs/hpux9 | 16
configs/hpux9-gcc | 14
configs/irix6-64 | 17
configs/irix6-64-static | 26
configs/irix6-n32 | 17
configs/irix6-n32-static | 25
configs/irix6-o32 | 18
configs/irix6-o32-static | 25
configs/linux | 38
configs/linux-alpha | 22
configs/linux-alpha-static | 31
configs/linux-cell | 71
configs/linux-cell-debug | 10
configs/linux-debug | 9
configs/linux-dri | 72
configs/linux-dri-debug | 16
configs/linux-dri-ppc | 17
configs/linux-dri-x86 | 13
configs/linux-dri-x86-64 | 24
configs/linux-dri-xcb | 55
configs/linux-egl | 57
configs/linux-fbdev | 19
configs/linux-i965 | 9
configs/linux-ia64-icc | 21
configs/linux-ia64-icc-static | 27
configs/linux-icc | 22
configs/linux-icc-static | 27
configs/linux-indirect | 52
configs/linux-llvm | 44
configs/linux-llvm-debug | 12
configs/linux-opengl-es | 28
configs/linux-osmesa | 28
configs/linux-osmesa-static | 37
configs/linux-osmesa16 | 31
configs/linux-osmesa16-static | 32
configs/linux-osmesa32 | 31
configs/linux-ppc | 9
configs/linux-ppc-static | 15
configs/linux-profile | 8
configs/linux-sparc | 9
configs/linux-sparc5 | 7
configs/linux-static | 26
configs/linux-ultrasparc | 7
configs/linux-x86 | 11
configs/linux-x86-32 | 7
configs/linux-x86-64 | 14
configs/linux-x86-64-debug | 8
configs/linux-x86-64-profile | 8
configs/linux-x86-64-static | 27
configs/linux-x86-debug | 9
configs/linux-x86-profile | 8
configs/linux-x86-static | 26
configs/netbsd | 17
configs/openbsd | 22
configs/osf1 | 16
configs/osf1-static | 17
configs/solaris-x86 | 18
configs/solaris-x86-gcc | 21
configs/solaris-x86-gcc-static | 28
configs/sunos4 | 12
configs/sunos4-gcc | 19
configs/sunos4-static | 25
configs/sunos5 | 18
configs/sunos5-64-gcc | 11
configs/sunos5-gcc | 40
configs/sunos5-smp | 19
configs/sunos5-v8 | 18
configs/sunos5-v8-static | 16
configs/sunos5-v9 | 23
configs/sunos5-v9-cc-g++ | 35
configs/sunos5-v9-static | 18
configs/ultrix-gcc | 25
configure.ac | 13
debian/README.source | 58
debian/changelog | 14
debian/control | 27
debian/es2_info.1 | 21
debian/es2gears.1 | 14
debian/es2tri.1 | 14
debian/install | 4
debian/mesa-utils-extra.install | 3
debian/mesa-utils-extra.manpages | 3
debian/mesa-utils.install | 4
debian/patches/properly_defining_default_precision_es2gears.patch | 36
debian/patches/series | 1
debian/rules | 22
doxygen/.gitignore | 21
doxygen/Makefile | 32
doxygen/README | 10
doxygen/common.doxy | 1153
doxygen/core_subset.doxy | 226
doxygen/doxy.bat | 19
doxygen/gallium.doc | 322
doxygen/gallium.doxy | 1303
doxygen/glapi.doxy | 49
doxygen/header.html | 17
doxygen/header_subset.html | 11
doxygen/main.doxy | 50
doxygen/math.doxy | 49
doxygen/math_subset.doxy | 177
doxygen/radeon_subset.doxy | 203
doxygen/shader.doxy | 49
doxygen/swrast.doxy | 48
doxygen/swrast_setup.doxy | 49
doxygen/tnl.doxy | 50
doxygen/tnl_dd.doxy | 49
doxygen/vbo.doxy | 50
include/EGL/egl.h | 329
include/EGL/eglext.h | 234
include/EGL/eglplatform.h | 110
include/GL/gl.h | 2241 -
include/GL/gl_mangle.h | 1985 -
include/GL/glew.h |13369 ---------
include/GL/glext.h |10081 -------
include/GL/glfbdev.h | 149
include/GL/glu.h | 353
include/GL/glu_mangle.h | 86
include/GL/glut.h | 665
include/GL/glutf90.h | 81
include/GL/glx.h | 542
include/GL/glx_mangle.h | 82
include/GL/glxew.h | 1446 -
include/GL/glxext.h | 948
include/GL/internal/dri_interface.h | 841
include/GL/internal/glcore.h | 181
include/GL/internal/sarea.h | 92
include/GL/mesa_wgl.h | 121
include/GL/osmesa.h | 289
include/GL/vms_x_fix.h | 1224
include/GL/wglew.h | 1247
include/GL/wglext.h | 869
include/GL/wmesa.h | 141
include/GLES/egl.h | 6
include/GLES/egltypes.h | 45
include/GLES/gl.h | 797
include/GLES/glext.h | 607
include/GLES/glplatform.h | 76
include/GLES2/gl2.h | 652
include/GLES2/gl2ext.h | 388
include/GLES2/gl2platform.h | 72
include/KHR/khrplatform.h | 273
include/VG/openvg.h | 686
include/VG/vgext.h | 233
include/VG/vgplatform.h | 111
include/VG/vgu.h | 130
include/c99/stdbool.h | 46
include/c99/stdint.h | 119
index.html | 110
scons/crossmingw.py | 187
scons/custom.py | 169
scons/dxsdk.py | 73
scons/fixes.py | 27
scons/gallium.py | 481
scons/mslib_sa.py | 137
scons/mslink_sa.py | 246
scons/msvc_sa.py | 246
scons/python.py | 72
scons/udis86.py | 42
scons/wcesdk.py | 176
scons/winddk.py | 148
scons/winsdk.py | 131
scons/x11.py | 52
src/CMakeLists.txt | 29
src/SConscript | 54
src/demos/.gitignore | 1
src/demos/CMakeLists.txt | 90
src/demos/Makefile.am | 2
src/demos/SConscript | 81
src/demos/arbocclude2.c | 171
src/demos/fbo_firecube.c | 1
src/demos/fire.c | 1
src/demos/geartrain.c | 175
src/demos/ipers.c | 2
src/demos/isosurf.c | 4
src/demos/lodbias.c | 2
src/demos/pixeltest.c | 466
src/demos/ray.c | 1
src/demos/renormal.c | 1
src/demos/spriteblast.c | 125
src/demos/stex3d.c | 7
src/demos/teapot.c | 1
src/demos/terrain.c | 1
src/demos/tessdemo.c | 44
src/demos/texenv.c | 1
src/demos/textures.c | 3
src/demos/tunnel.c | 1
src/demos/tunnel2.c | 1
src/egl/CMakeLists.txt | 2
src/egl/eglut/CMakeLists.txt | 7
src/egl/eglut/eglut.c | 25
src/egl/eglut/eglut.h | 25
src/egl/eglut/eglut_screen.c | 25
src/egl/eglut/eglut_x11.c | 36
src/egl/eglut/eglutint.h | 25
src/egl/opengl/.gitignore | 1
src/egl/opengl/CMakeLists.txt | 15
src/egl/opengl/Makefile.am | 17
src/egl/opengl/eglkms.c | 253
src/egl/opengl/peglgears.c | 15
src/egl/opengl/xeglgears.c | 23
src/egl/opengles1/.gitignore | 1
src/egl/opengles1/Makefile.am | 5
src/egl/opengles1/clear.c | 95
src/egl/opengles1/es1_info.c | 6
src/egl/opengles1/texture_from_pixmap.c | 21
src/egl/opengles1/tri.c | 2
src/egl/opengles2/.gitignore | 2
src/egl/opengles2/Makefile.am | 9
src/egl/opengles2/es2_info.c | 1
src/egl/opengles2/es2gears.c | 658
src/egl/opengles2/es2tri.c | 516
src/egl/opengles2/tri.c | 516
src/egl/openvg/.gitignore | 7
src/egl/openvg/Makefile.am | 13
src/egl/openvg/lion.c | 22
src/egl/openvg/text.c | 430
src/egl/openvg/trivial/Makefile.am | 13
src/egl/openvg/trivial/blend.c | 277
src/egl/openvg/trivial/color_transform.c | 136
src/egl/openvg/trivial/eglcommon.c | 9
src/egl/openvg/trivial/eglcommon.h | 1
src/egl/openvg/trivial/image.c | 81
src/egl/openvg/trivial/layer.c | 109
src/egl/openvg/trivial/mask_render.c | 134
src/egl/openvg/trivial/paint.c | 155
src/fp/CMakeLists.txt | 41
src/fp/SConscript | 27
src/fpglsl/CMakeLists.txt | 34
src/fpglsl/SConscript | 13
src/fpglsl/fp-tri.c | 14
src/glew/LICENSE.txt | 73
src/glew/glew.c |14320 ----------
src/glew/glewinfo.c | 8441 -----
src/glew/visualinfo.c | 1173
src/glsl/.gitignore | 1
src/glsl/SConscript | 40
src/glsl/bezier.c | 1
src/glsl/brick.c | 16
src/glsl/multitex.c | 6
src/glsl/pointcoord.c | 13
src/glsl/samplers.c | 4
src/glsl/shadow_sampler.c | 14
src/glsl/texdemo1.c | 6
src/gs/.gitignore | 1
src/gs/CMakeLists.txt | 34
src/gs/SConscript | 13
src/images/CMakeLists.txt | 3
src/images/SConscript | 10
src/objviewer/CMakeLists.txt | 31
src/objviewer/glmdraw.c | 2
src/objviewer/objview.c | 6
src/perf/CMakeLists.txt | 39
src/perf/Makefile.am | 4
src/perf/SConscript | 25
src/perf/glslstateschange.c | 272
src/perf/glslstateschange1.frag | 19
src/perf/glslstateschange1.vert | 14
src/perf/glslstateschange2.frag | 17
src/perf/glslstateschange2.vert | 14
src/redbook/CMakeLists.txt | 105
src/redbook/SConscript | 86
src/redbook/cubemap.c | 1
src/redbook/multisamp.c | 1
src/redbook/quadric.c | 10
src/redbook/surfpoints.c | 14
src/redbook/tess.c | 42
src/redbook/tesswind.c | 28
src/redbook/trim.c | 10
src/samples/CMakeLists.txt | 78
src/samples/SConscript | 40
src/samples/nurb.c | 11
src/samples/quad.c | 11
src/tests/.gitignore | 2
src/tests/CMakeLists.txt | 166
src/tests/Makefile.am | 3
src/tests/SConscript | 124
src/tests/bumpmap.c | 2
src/tests/floattex.c | 4
src/tests/fog.c | 200
src/tests/mipmap_tunnel.c | 250
src/tests/occlude.c | 2
src/tests/prog_parameter.c | 31
src/tests/shader_api.c | 6
src/tests/step.c | 180
src/tests/texdown.c | 1
src/tools/trace/gltrace.py | 12
src/trivial/.gitignore | 4
src/trivial/CMakeLists.txt | 198
src/trivial/Makefile.am | 5
src/trivial/SConscript | 174
src/trivial/clear-color.c | 128
src/trivial/clear.c | 128
src/trivial/drawelements-large.c | 121
src/trivial/line-smooth.c | 1
src/trivial/line-xor.c | 128
src/trivial/point-sprite.c | 1
src/trivial/quad-tex-2d.c | 1
src/trivial/quad-tex-alpha.c | 1
src/trivial/tri-alpha-tex.c | 1
src/trivial/tri-clear.c | 2
src/trivial/tri-edgeflag-array.c | 119
src/trivial/tri-tex-1d.c | 186
src/trivial/tri-tex.c | 1
src/util/CMakeLists.txt | 13
src/util/SConscript | 15
src/util/shaderutil.c | 127
src/util/shaderutil.h | 23
src/vp/CMakeLists.txt | 34
src/vp/SConscript | 15
src/vpglsl/CMakeLists.txt | 34
src/vpglsl/SConscript | 6
src/wgl/CMakeLists.txt | 17
src/wgl/Makefile.am | 4
src/wgl/SConscript | 27
src/wgl/sharedtex_mt.c | 565
src/wgl/sharedtex_mt/sharedtex_mt.c | 565
src/wgl/wglinfo.c | 5
src/wgl/wglthreads.c | 636
src/wgl/wglthreads/wglthreads.c | 636
src/xdemos/CMakeLists.txt | 73
src/xdemos/SConscript | 75
src/xdemos/glxinfo.c | 140
src/xdemos/glxswapcontrol.c | 8
src/xdemos/yuvrect_client.c | 8
windows/VC7/mesa/gdi/gdi.vcproj | 195
windows/VC7/mesa/glu/glu.vcproj | 766
windows/VC7/mesa/mesa.sln | 47
windows/VC7/mesa/mesa/mesa.vcproj | 1194
windows/VC7/mesa/osmesa/osmesa.vcproj | 182
windows/VC7/progs/glut/glut.vcproj | 322
windows/VC7/progs/progs.sln | 29
windows/VC7/progs/wgl/sharedtex_mt.vcproj | 132
windows/VC7/progs/wgl/wglthreads.vcproj | 132
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 | 2434 -
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
385 files changed, 8147 insertions(+), 92148 deletions(-)
New commits:
commit af2fa0a92f120bb52b8a5705b595d4248c321593
Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Fri Jul 29 17:59:44 2011 +1000
Import Ubuntu changes from outside git
diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..5dde0bf
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,58 @@
+This package uses quilt to manage all modifications to the upstream
+source. Changes are stored in the source package as diffs in
+debian/patches and applied during the build.
+
+To configure quilt to use debian/patches instead of patches, you want
+either to export QUILT_PATCHES=debian/patches in your environment
+or use this snippet in your ~/.quiltrc:
+
+ for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do
+ if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then
+ export QUILT_PATCHES=debian/patches
+ break
+ fi
+ done
+
+To get the fully patched source after unpacking the source package, cd to
+the root level of the source package and run:
+
+ quilt push -a
+
+The last patch listed in debian/patches/series will become the current
+patch.
+
+To add a new set of changes, first run quilt push -a, and then run:
+
+ quilt new <patch>
+
+where <patch> is a descriptive name for the patch, used as the filename in
+debian/patches. Then, for every file that will be modified by this patch,
+run:
+
+ quilt add <file>
+
+before editing those files. You must tell quilt with quilt add what files
+will be part of the patch before making changes or quilt will not work
+properly. After editing the files, run:
+
+ quilt refresh
+
+to save the results as a patch.
+
+Alternately, if you already have an external patch and you just want to
+add it to the build system, run quilt push -a and then:
+
+ quilt import -P <patch> /path/to/patch
+ quilt push -a
+
+(add -p 0 to quilt import if needed). <patch> as above is the filename to
+use in debian/patches. The last quilt push -a will apply the patch to
+make sure it works properly.
+
+To remove an existing patch from the list of patches that will be applied,
+run:
+
+ quilt delete <patch>
+
+You may need to run quilt pop -a to unapply patches first before running
+this command.
diff --git a/debian/changelog b/debian/changelog
index 90f4ab7..8e8ba45 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+mesa-demos (8.0.1+git20110129+d8f7d6b-0ubuntu2) natty; urgency=low
+
+ * debian/patches/properly_defining_default_precision_es2gears.patch:
+ - Properly defining default precision in es2gears fragment shader
+
+ -- Ricardo Salveti de Araujo <ricardo.salveti@canonical.com> Fri, 04 Feb 2011 10:38:48 -0200
+
+mesa-demos (8.0.1+git20110129+d8f7d6b-0ubuntu1) natty; urgency=low
+
+ * New release based on current git tree
+ * Added package mesa-utils-extra containing the EGL/GLES2 demos
+
+ -- Ricardo Salveti de Araujo <ricardo.salveti@canonical.com> Tue, 01 Feb 2011 16:09:50 -0200
+
mesa-demos (8.0.1-0ubuntu1) maverick; urgency=low
[ Robert Hooker ]
diff --git a/debian/control b/debian/control
index e370e1e..e46946d 100644
--- a/debian/control
+++ b/debian/control
@@ -4,6 +4,7 @@ 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,
@@ -13,9 +14,9 @@ Build-Depends: debhelper (>= 7.2.7),
libgl1-mesa-dev,
libglew1.5-dev,
libglu1-mesa-dev,
-# libegl1-mesa-dev,
-# libgles1-mesa-dev,
-# libgles2-mesa-dev,
+ libegl1-mesa-dev,
+ libgles1-mesa-dev,
+ libgles2-mesa-dev,
Homepage: http://mesa3d.sourceforge.net/
Vcs-Git: git://git.debian.org/git/pkg-xorg/app/mesa-demos.git
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/mesa-demos.git
@@ -31,13 +32,13 @@ Description: Miscellaneous Mesa GL utilities
This package provides several basic GL utilities built by Mesa, including
glxinfo and glxgears.
-#Package: mesa-utils-extra
-#Section: x11
-#Priority: optional
-#Architecture: any
-#Depends:
-# ${shlibs:Depends},
-# ${misc:Depends},
-#Description: Miscellaneous Mesa utilies (opengles, egl)
-# This package provides several basic utilities built from Mesa, including
-# eglgears, eglinfo, glesgears
+Package: mesa-utils-extra
+Section: x11
+Priority: optional
+Architecture: any
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends},
+Description: Miscellaneous Mesa utilies (opengles, egl)
+ This package provides several basic utilities built from Mesa, including
+ es2gears, es2_info and es2tri
diff --git a/debian/es2_info.1 b/debian/es2_info.1
new file mode 100644
index 0000000..43387d0
--- /dev/null
+++ b/debian/es2_info.1
@@ -0,0 +1,21 @@
+.TH es2_info 1 "2011-02-01"
+.SH NAME
+es2_info \- list OpenGL ES extensions
+.SH SYNOPSIS
+.B es2_info
+.RI [ options ]
+.SH DESCRIPTION
+The \fIes2_info\fP program shows information about the supported OpenGL ES
+extensions.
+.SH OPTIONS
+.TP 8
+.B \-display \fIdisplay\fP
+Specify the X display to run on.
+.TP 8
+.B \-h
+Print usage information.
+.SH AUTHOR
+es2_info was written by Tunsgten Graphics.
+.PP
+This manual page was written by Ricardo Salveti de Araujo <ricardo.salveti@canonical.com>,
+for the Debian project (but may be used by others).
diff --git a/debian/es2gears.1 b/debian/es2gears.1
new file mode 100644
index 0000000..e6da576
--- /dev/null
+++ b/debian/es2gears.1
@@ -0,0 +1,14 @@
+.TH es2gears 1 "2011-02-01"
+.SH NAME
+es2gears \- ``gears'' demo for GLES2
+.SH SYNOPSIS
+.B es2gears
+.SH DESCRIPTION
+The \fIes2gears\fP program is a port of the ``gears'' demo to GLES2. It displays
+a set of rotating gears and prints out the frame rate at regular intervals. It
+has become quite popular as basic benchmarking tool.
+.SH AUTHOR
+glxgears was written by Brian Paul <brian.paul@tungstengraphics.com>.
+.PP
+This manual page was written by Ricardo Salveti de Araujo <ricardo.salveti@canonical.com>,
+for the Debian project (but may be used by others).
diff --git a/debian/es2tri.1 b/debian/es2tri.1
new file mode 100644
index 0000000..e5240e7
--- /dev/null
+++ b/debian/es2tri.1
@@ -0,0 +1,14 @@
+.TH es2tri 1 "2011-02-01"
+.SH NAME
+es2tri \- a draw demonstration using X/EGL and OpenGL ES 2.x
+.SH SYNOPSIS
+.B es2tri
+.SH DESCRIPTION
+The \fIes2tri\fP program demonstrate the usage of X/EGL and OpenGL ES 2.x by
+drawing a triangle at the screen. This program is most useful when studied
+in its source code form.
+.SH AUTHOR
+es2tri was written by Tungsten Graphics.
+.PP
+This manual page was written by Ricardo Salveti de Araujo <ricardo.salveti@canonical.com>,
+for the Debian project (but may be used by others).
diff --git a/debian/install b/debian/install
deleted file mode 100644
index 4d4d07e..0000000
--- a/debian/install
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/bin/glxdemo
-usr/bin/glxgears
-usr/bin/glxheads
-usr/bin/glxinfo
diff --git a/debian/mesa-utils-extra.install b/debian/mesa-utils-extra.install
new file mode 100644
index 0000000..4592e03
--- /dev/null
+++ b/debian/mesa-utils-extra.install
@@ -0,0 +1,3 @@
+usr/bin/es2_info
+usr/bin/es2gears
+usr/bin/es2tri
diff --git a/debian/mesa-utils-extra.manpages b/debian/mesa-utils-extra.manpages
new file mode 100644
index 0000000..31ebcf1
--- /dev/null
+++ b/debian/mesa-utils-extra.manpages
@@ -0,0 +1,3 @@
+debian/es2_info.1
+debian/es2gears.1
+debian/es2tri.1
diff --git a/debian/mesa-utils.install b/debian/mesa-utils.install
new file mode 100644
index 0000000..4d4d07e
--- /dev/null
+++ b/debian/mesa-utils.install
@@ -0,0 +1,4 @@
+usr/bin/glxdemo
+usr/bin/glxgears
+usr/bin/glxheads
+usr/bin/glxinfo
diff --git a/debian/patches/properly_defining_default_precision_es2gears.patch b/debian/patches/properly_defining_default_precision_es2gears.patch
new file mode 100644
index 0000000..4374885
--- /dev/null
+++ b/debian/patches/properly_defining_default_precision_es2gears.patch
@@ -0,0 +1,36 @@
+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
new file mode 100644
index 0000000..19a4235
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+properly_defining_default_precision_es2gears.patch
diff --git a/debian/rules b/debian/rules
index 0d2abbe..1bfde17 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,26 @@
#!/usr/bin/make -f
+
+deb_source := $(shell dpkg-parsechangelog | sed -n 's/^Source: //p')
+deb_version := $(shell dpkg-parsechangelog | sed -n 's/^Version: //p')
+upstream_version := $(shell echo '$(deb_version)' | sed 's/.*://; s/-[^-]*$$//')
+git_rev := $(shell echo '$(upstream_version)' | sed 's/.*+//')
+
+# XXX for some reason, --remote doesn't work with anongit.freedesktop.org
+# so this needs to be run from a local checkout
+# --remote=git://anongit.freedesktop.org/mesa/demos
+get-orig-source:
+ rm -rf $(deb_source)-$(upstream_version)
+ rm -f $(deb_source)-$(upstream_version).orig.tar.gz
+ git clone git://anongit.freedesktop.org/mesa/demos $(deb_source)-$(upstream_version)
+ cd $(deb_source)-$(upstream_version) && git archive \
+ --format=tar \
+ --prefix=$(deb_source)-$(upstream_version)/ \
+ $(git_rev) \
+ | gzip >../$(deb_source)_$(upstream_version).orig.tar.gz
+ rm -rf $(deb_source)-$(upstream_version)
+
%:
- dh --with=autoreconf $@
+ dh --with=quilt --with=autoreconf $@
override_dh_auto_install:
dh_auto_install --destdir=debian/tmp
diff --git a/src/egl/opengles2/es2_info.c b/src/egl/opengles2/es2_info.c
new file mode 120000
index 0000000..bde3140
--- /dev/null
+++ b/src/egl/opengles2/es2_info.c
@@ -0,0 +1 @@
+../opengles1/es1_info.c
\ No newline at end of file
commit d8f7d6bac9415581c02b18ebb462d3d9951fe5b4
Author: Jure Repinc <jlp@holodeck1.com>
Date: Wed Jan 26 02:31:52 2011 +0100
egl/opengl: fixed linking of eglgears_* with libm
diff --git a/src/egl/opengl/CMakeLists.txt b/src/egl/opengl/CMakeLists.txt
index ede9ec3..3a012e1 100644
--- a/src/egl/opengl/CMakeLists.txt
+++ b/src/egl/opengl/CMakeLists.txt
@@ -6,10 +6,10 @@ add_executable(eglinfo eglinfo.c)
target_link_libraries(eglinfo ${EGL_egl_LIBRARY})
add_executable(eglgears_screen eglgears.c)
-target_link_libraries(eglgears_screen ${EGL_egl_LIBRARY} eglut_screen)
+target_link_libraries(eglgears_screen ${EGL_egl_LIBRARY} eglut_screen m)
if(X11_FOUND)
add_executable(eglgears_x11 eglgears.c)
- target_link_libraries(eglgears_x11 ${EGL_egl_LIBRARY} eglut_x11)
+ target_link_libraries(eglgears_x11 ${EGL_egl_LIBRARY} eglut_x11 m)
endif(X11_FOUND)
commit c1be1ce356e9cdedec558c503d6c74e6e1913d9f
Author: Marek Olšák <maraeo@gmail.com>
Date: Tue Jan 25 13:42:16 2011 +0100
tri-clear: fix redrawing
diff --git a/src/trivial/tri-clear.c b/src/trivial/tri-clear.c
index e52ed81..df3616e 100644
--- a/src/trivial/tri-clear.c
+++ b/src/trivial/tri-clear.c
@@ -42,7 +42,6 @@ static void Init(void)
fprintf(stderr, "GL_VENDOR = %s\n", (char *) glGetString(GL_VENDOR));
fflush(stderr);
- glClearColor(0.0, 0.0, 1.0, 0.0);
}
static void Reshape(int width, int height)
@@ -71,6 +70,7 @@ static void Key(unsigned char key, int x, int y)
static void Draw(void)
{
+ glClearColor(0.0, 0.0, 1.0, 0.0);
glClear(GL_COLOR_BUFFER_BIT);
glBegin(GL_TRIANGLES);
commit 049ab345b8da859f1853017f2d33d012c5f4b83b
Author: Jakob Bornecrantz <wallbraker@gmail.com>
Date: Mon Jan 24 05:12:41 2011 +0100
tests: Add application to step various gl operations
diff --git a/src/tests/.gitignore b/src/tests/.gitignore
index b6d112e..852ba52 100644
--- a/src/tests/.gitignore
+++ b/src/tests/.gitignore
@@ -83,6 +83,7 @@ stencilreaddraw
stencil_twoside
stencilwrap
stencil_wrap
+step
streaming_rect
subtex
subtexrate
diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index b998a61..d807c9b 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -100,6 +100,7 @@ set (targets
shader_api
stencilreaddraw
stencilwrap
+ step
streaming_rect
subtex
subtexrate
diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index 6baa94f..e650b62 100644
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -127,6 +127,7 @@ noinst_PROGRAMS = \
sharedtex \
stencilreaddraw \
stencilwrap \
+ step \
streaming_rect \
subtex \
subtexrate \
diff --git a/src/tests/step.c b/src/tests/step.c
new file mode 100644
index 0000000..c6a317e
--- /dev/null
+++ b/src/tests/step.c
@@ -0,0 +1,180 @@
+/*
+ * Copyright (c) 1991, 1992, 1993 Silicon Graphics, Inc.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and
+ * its documentation for any purpose is hereby granted without fee, provided
+ * that (i) the above copyright notices and this permission notice appear in
+ * all copies of the software and related documentation, and (ii) the name of
+ * Silicon Graphics may not be used in any advertising or
+ * publicity relating to the software without the specific, prior written
+ * permission of Silicon Graphics.
+ *
+ * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF
+ * ANY KIND,
+ * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * IN NO EVENT SHALL SILICON GRAPHICS BE LIABLE FOR
+ * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
+ * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+ * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
+ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <GL/glut.h>
+
+
+#define CI_OFFSET_1 16
+#define CI_OFFSET_2 32
+
+
+GLenum doubleBuffer = 1;
+int win;
+
+static void Init(void)
+{
+ fprintf(stderr, "GL_RENDERER = %s\n", (char *) glGetString(GL_RENDERER));
+ fprintf(stderr, "GL_VERSION = %s\n", (char *) glGetString(GL_VERSION));
+ fprintf(stderr, "GL_VENDOR = %s\n", (char *) glGetString(GL_VENDOR));
+ fflush(stderr);
+
+ glClearColor(0.3, 0.1, 0.3, 0.0);
+}
+
+static void Reshape(int width, int height)
+{
+ glViewport(0, 0, (GLint)width, (GLint)height);
+
+ glMatrixMode(GL_PROJECTION);
+ glLoadIdentity();
+ glOrtho(-1.0, 1.0, -1.0, 1.0, -0.5, 1000.0);
+ glMatrixMode(GL_MODELVIEW);
+}
+
+static void Clear(void)
+{
+ fprintf(stderr, "::clearing\n");
+ fflush(stderr);
+
+ glClear(GL_COLOR_BUFFER_BIT);
+}
+
+static void DrawTri(void)
+{
+ fprintf(stderr, "::drawing - tri\n");
+ fflush(stderr);
+
+ glBegin(GL_TRIANGLES);
+ glColor3f(.8,0,0);
+ glVertex3f(-0.9, -0.9, -30.0);
+ glColor3f(0,.9,0);
+ glVertex3f( 0.9, -0.9, -30.0);
+ glColor3f(0,0,.7);
+ glVertex3f( 0.0, 0.9, -30.0);
+ glEnd();
+}
+
+static void DrawClipTri(void)
+{
+ fprintf(stderr, "::drawing - tri clipped\n");
+ fflush(stderr);
+
+ glBegin(GL_TRIANGLES);
+ glColor3f(.8,0,0);
+ glVertex3f(-0.9, 0.9, -30.0);
+ glColor3f(0,.9,0);
+ glVertex3f( 0.9, 0.9, -30.0);
+ glColor3f(0,0,.7);
+ glVertex3f( 0.0, -1.9, -30.0);
+ glEnd();
+}
+
+static void Swap(void)
+{
+ fprintf(stderr, "::swapping\n");
+ fflush(stderr);
+
+ glutSwapBuffers();
+}
+
+static void Flush(void)
+{
+ fprintf(stderr, "::flush\n");
+ fflush(stderr);
+
+ glFlush();
+}
+
+static void Key(unsigned char key, int x, int y)
+{
+ switch (key) {
+ case 27:
+ glutDestroyWindow(win);
+ exit(0);
+ case 't':
+ DrawTri();
+ break;
+ case 'T':
+ DrawClipTri();
+ break;
+ case 'f':
+ Flush();
+ break;
+ case 's':
+ Swap();
+ Clear();
+ break;
+ default:
+ return;
+ }
+}
+
+static void Draw(void)
+{
+ Clear();
+ DrawTri();
+ DrawClipTri();
+ Swap();
+ Clear();
+}
+
+static void
+Usage(void)
+{
+ printf("usage:\n");
+ printf(" t/T draw a triangle (caps for clipped)\n");
+ printf(" f flush\n");
+ printf(" s swap\n");
+}
+
+int main(int argc, char **argv)
+{
+ GLenum type;
+
+ glutInit(&argc, argv);
+
+ glutInitWindowPosition(0, 0);
+ glutInitWindowSize(250, 250);
+
+ type = GLUT_RGB | GLUT_ALPHA | GLUT_DOUBLE;
+ glutInitDisplayMode(type);
+
+ win = glutCreateWindow(*argv);
+ if (!win) {
+ exit(1);
+ }
+
+ Init();
+
+ Usage();
+
+ glutReshapeFunc(Reshape);
+ glutKeyboardFunc(Key);
+ glutDisplayFunc(Draw);
Reply to: