Makefile.am | 2
configs/default | 2
configure.ac | 71
debian/changelog | 11
debian/control | 44
debian/libegl1-mesa-drivers.install.linux.in | 2
debian/libgles2-mesa.symbols | 4
debian/libglu1-mesa-dev.install.in | 5
debian/libglu1-mesa.install.in | 1
debian/libglu1-mesa.lintian-overrides | 1
debian/libglu1-mesa.shlibs | 1
debian/not-installed | 9
debian/patches/02_use-ieee-fp-on-s390-and-m68k.patch | 8
debian/patches/04_osmesa_version.diff | 27
debian/patches/06_kfreebsd-ftbfs.diff | 2
debian/patches/10-hurd-configure-tweaks.diff | 2
debian/patches/13-llvm-config-pick-a-version.diff | 2
debian/rules | 15
docs/autoconf.html | 10
docs/contents.html | 1
docs/download.html | 18
docs/faq.html | 4
docs/glu.html | 46
docs/install.html | 5
docs/license.html | 2
docs/relnotes-9.0.html | 18
docs/sourcetree.html | 5
include/GL/glu.h | 353
include/GL/glu_mangle.h | 86
include/GL/internal/dri_interface.h | 67
scons/gallium.py | 2
src/SConscript | 2
src/egl/drivers/dri2/egl_dri2.c | 128
src/egl/drivers/dri2/platform_android.c | 36
src/gallium/auxiliary/tgsi/tgsi_scan.c | 1
src/gallium/auxiliary/util/u_format_yuv.c | 1
src/gallium/auxiliary/util/u_inlines.h | 4
src/gallium/auxiliary/util/u_math.h | 1
src/gallium/drivers/radeon/AMDGPU.h | 1
src/gallium/drivers/radeon/AMDGPUAsmPrinter.cpp | 8
src/gallium/drivers/radeon/AMDGPUTargetMachine.cpp | 2
src/gallium/drivers/radeon/MCTargetDesc/SIMCCodeEmitter.cpp | 39
src/gallium/drivers/radeon/Makefile.sources | 1
src/gallium/drivers/radeon/R600Instructions.td | 8
src/gallium/drivers/radeon/SIGenRegisterInfo.pl | 1
src/gallium/drivers/radeon/SIISelLowering.h | 2
src/gallium/drivers/radeon/SIInstrInfo.td | 10
src/gallium/drivers/radeon/SIInstructions.td | 35
src/gallium/drivers/radeon/SILowerLiteralConstants.cpp | 105
src/gallium/drivers/radeonsi/radeonsi_pipe.c | 4
src/gallium/drivers/radeonsi/radeonsi_shader.c | 8
src/gallium/drivers/radeonsi/si_state.c | 4
src/gallium/state_trackers/dri/common/dri_context.c | 6
src/gallium/state_trackers/dri/common/dri_screen.c | 10
src/gallium/state_trackers/dri/common/dri_screen.h | 1
src/gallium/state_trackers/dri/drm/dri2.c | 82
src/gallium/state_trackers/glx/xlib/glx_usefont.c | 4
src/gallium/state_trackers/glx/xlib/xm_api.c | 10
src/gallium/state_trackers/glx/xlib/xm_st.c | 8
src/gallium/state_trackers/vega/handle.h | 1
src/gbm/backends/dri/gbm_dri.c | 33
src/glu/.gitignore | 1
src/glu/Makefile | 40
src/glu/glu.pc.in | 13
src/glu/sgi/.gitignore | 1
src/glu/sgi/Makefile | 144
src/glu/sgi/SConscript | 143
src/glu/sgi/dummy.cc | 4
src/glu/sgi/glu.def | 88
src/glu/sgi/glu.exports | 118
src/glu/sgi/glu.exports.darwin | 59
src/glu/sgi/include/gluos.h | 86
src/glu/sgi/libnurbs/interface/bezierEval.cc | 260
src/glu/sgi/libnurbs/interface/bezierEval.h | 48
src/glu/sgi/libnurbs/interface/bezierPatch.cc | 206
src/glu/sgi/libnurbs/interface/bezierPatch.h | 104
src/glu/sgi/libnurbs/interface/bezierPatchMesh.cc | 610
src/glu/sgi/libnurbs/interface/bezierPatchMesh.h | 121
src/glu/sgi/libnurbs/interface/glcurveval.cc | 402
src/glu/sgi/libnurbs/interface/glcurveval.h | 157
src/glu/sgi/libnurbs/interface/glimports.h | 42
src/glu/sgi/libnurbs/interface/glinterface.cc | 469
src/glu/sgi/libnurbs/interface/glrenderer.cc | 301
src/glu/sgi/libnurbs/interface/glrenderer.h | 146
src/glu/sgi/libnurbs/interface/glsurfeval.cc | 1293 -
src/glu/sgi/libnurbs/interface/glsurfeval.h | 404
src/glu/sgi/libnurbs/interface/incurveeval.cc | 206
src/glu/sgi/libnurbs/interface/insurfeval.cc | 2064 --
src/glu/sgi/libnurbs/interface/mystdio.h | 60
src/glu/sgi/libnurbs/interface/mystdlib.h | 57
src/glu/sgi/libnurbs/internals/arc.cc | 346
src/glu/sgi/libnurbs/internals/arc.h | 139
src/glu/sgi/libnurbs/internals/arcsorter.cc | 172
src/glu/sgi/libnurbs/internals/arcsorter.h | 72
src/glu/sgi/libnurbs/internals/arctess.cc | 611
src/glu/sgi/libnurbs/internals/arctess.h | 66
src/glu/sgi/libnurbs/internals/backend.cc | 588
src/glu/sgi/libnurbs/internals/backend.h | 113
src/glu/sgi/libnurbs/internals/basiccrveval.cc | 138
src/glu/sgi/libnurbs/internals/basiccrveval.h | 62
src/glu/sgi/libnurbs/internals/basicsurfeval.cc | 232
src/glu/sgi/libnurbs/internals/basicsurfeval.h | 90
src/glu/sgi/libnurbs/internals/bezierarc.h | 51
src/glu/sgi/libnurbs/internals/bin.cc | 167
src/glu/sgi/libnurbs/internals/bin.h | 121
src/glu/sgi/libnurbs/internals/bufpool.cc | 113
src/glu/sgi/libnurbs/internals/bufpool.h | 141
src/glu/sgi/libnurbs/internals/cachingeval.cc | 78
src/glu/sgi/libnurbs/internals/cachingeval.h | 51
src/glu/sgi/libnurbs/internals/ccw.cc | 565
src/glu/sgi/libnurbs/internals/coveandtiler.cc | 440
src/glu/sgi/libnurbs/internals/coveandtiler.h | 72
src/glu/sgi/libnurbs/internals/curve.cc | 204
src/glu/sgi/libnurbs/internals/curve.h | 70
src/glu/sgi/libnurbs/internals/curvelist.cc | 112
src/glu/sgi/libnurbs/internals/curvelist.h | 62
src/glu/sgi/libnurbs/internals/curvesub.cc | 102
src/glu/sgi/libnurbs/internals/dataTransform.cc | 209
src/glu/sgi/libnurbs/internals/dataTransform.h | 59
src/glu/sgi/libnurbs/internals/defines.h | 50
src/glu/sgi/libnurbs/internals/displaylist.cc | 82
src/glu/sgi/libnurbs/internals/displaylist.h | 79
src/glu/sgi/libnurbs/internals/displaymode.h | 40
src/glu/sgi/libnurbs/internals/flist.cc | 118
src/glu/sgi/libnurbs/internals/flist.h | 59
src/glu/sgi/libnurbs/internals/flistsorter.cc | 81
src/glu/sgi/libnurbs/internals/flistsorter.h | 53
src/glu/sgi/libnurbs/internals/gridline.h | 46
src/glu/sgi/libnurbs/internals/gridtrimvertex.h | 89
src/glu/sgi/libnurbs/internals/gridvertex.h | 48
src/glu/sgi/libnurbs/internals/hull.cc | 165
src/glu/sgi/libnurbs/internals/hull.h | 69
src/glu/sgi/libnurbs/internals/intersect.cc | 665
src/glu/sgi/libnurbs/internals/jarcloc.h | 87
src/glu/sgi/libnurbs/internals/knotvector.cc | 142
src/glu/sgi/libnurbs/internals/knotvector.h | 62
src/glu/sgi/libnurbs/internals/mapdesc.cc | 841 -
src/glu/sgi/libnurbs/internals/mapdesc.h | 271
src/glu/sgi/libnurbs/internals/mapdescv.cc | 243
src/glu/sgi/libnurbs/internals/maplist.cc | 116
src/glu/sgi/libnurbs/internals/maplist.h | 81
src/glu/sgi/libnurbs/internals/mesher.cc | 489
src/glu/sgi/libnurbs/internals/mesher.h | 83
src/glu/sgi/libnurbs/internals/monoTriangulationBackend.cc | 397
src/glu/sgi/libnurbs/internals/monotonizer.cc | 260
src/glu/sgi/libnurbs/internals/monotonizer.h | 64
src/glu/sgi/libnurbs/internals/myassert.h | 51
src/glu/sgi/libnurbs/internals/mycode.cc | 67
src/glu/sgi/libnurbs/internals/mymath.h | 68
src/glu/sgi/libnurbs/internals/mysetjmp.h | 85
src/glu/sgi/libnurbs/internals/mystring.h | 56
src/glu/sgi/libnurbs/internals/nurbsconsts.h | 120
src/glu/sgi/libnurbs/internals/nurbsinterfac.cc | 537
src/glu/sgi/libnurbs/internals/nurbstess.cc | 691
src/glu/sgi/libnurbs/internals/nurbstess.h | 172
src/glu/sgi/libnurbs/internals/patch.cc | 504
src/glu/sgi/libnurbs/internals/patch.h | 94
src/glu/sgi/libnurbs/internals/patchlist.cc | 169
src/glu/sgi/libnurbs/internals/patchlist.h | 92
src/glu/sgi/libnurbs/internals/pwlarc.h | 78
src/glu/sgi/libnurbs/internals/quilt.cc | 274
src/glu/sgi/libnurbs/internals/quilt.h | 92
src/glu/sgi/libnurbs/internals/reader.cc | 148
src/glu/sgi/libnurbs/internals/reader.h | 132
src/glu/sgi/libnurbs/internals/renderhints.cc | 136
src/glu/sgi/libnurbs/internals/renderhints.h | 60
src/glu/sgi/libnurbs/internals/simplemath.h | 52
src/glu/sgi/libnurbs/internals/slicer.cc | 1304 -
src/glu/sgi/libnurbs/internals/slicer.h | 84
src/glu/sgi/libnurbs/internals/sorter.cc | 139
src/glu/sgi/libnurbs/internals/sorter.h | 51
src/glu/sgi/libnurbs/internals/splitarcs.cc | 293
src/glu/sgi/libnurbs/internals/subdivider.cc | 912 -
src/glu/sgi/libnurbs/internals/subdivider.h | 200
src/glu/sgi/libnurbs/internals/tobezier.cc | 687
src/glu/sgi/libnurbs/internals/trimline.cc | 223
src/glu/sgi/libnurbs/internals/trimline.h | 103
src/glu/sgi/libnurbs/internals/trimregion.cc | 113
src/glu/sgi/libnurbs/internals/trimregion.h | 84
src/glu/sgi/libnurbs/internals/trimvertex.h | 63
src/glu/sgi/libnurbs/internals/trimvertpool.cc | 119
src/glu/sgi/libnurbs/internals/trimvertpool.h | 57
src/glu/sgi/libnurbs/internals/types.h | 47
src/glu/sgi/libnurbs/internals/uarray.cc | 73
src/glu/sgi/libnurbs/internals/uarray.h | 55
src/glu/sgi/libnurbs/internals/varray.cc | 152
src/glu/sgi/libnurbs/internals/varray.h | 68
src/glu/sgi/libnurbs/nurbtess/definitions.h | 40
src/glu/sgi/libnurbs/nurbtess/directedLine.cc | 860 -
src/glu/sgi/libnurbs/nurbtess/directedLine.h | 171
src/glu/sgi/libnurbs/nurbtess/glimports.h | 42
src/glu/sgi/libnurbs/nurbtess/gridWrap.cc | 293
src/glu/sgi/libnurbs/nurbtess/gridWrap.h | 137
src/glu/sgi/libnurbs/nurbtess/monoChain.cc | 936 -
src/glu/sgi/libnurbs/nurbtess/monoChain.h | 103
src/glu/sgi/libnurbs/nurbtess/monoPolyPart.cc | 299
src/glu/sgi/libnurbs/nurbtess/monoPolyPart.h | 41
src/glu/sgi/libnurbs/nurbtess/monoTriangulation.cc | 1482 -
src/glu/sgi/libnurbs/nurbtess/monoTriangulation.h | 184
src/glu/sgi/libnurbs/nurbtess/mystdio.h | 60
src/glu/sgi/libnurbs/nurbtess/mystdlib.h | 57
src/glu/sgi/libnurbs/nurbtess/partitionX.cc | 162
src/glu/sgi/libnurbs/nurbtess/partitionX.h | 54
src/glu/sgi/libnurbs/nurbtess/partitionY.cc | 836 -
src/glu/sgi/libnurbs/nurbtess/partitionY.h | 97
src/glu/sgi/libnurbs/nurbtess/polyDBG.cc | 734
src/glu/sgi/libnurbs/nurbtess/polyDBG.h | 68
src/glu/sgi/libnurbs/nurbtess/polyUtil.cc | 90
src/glu/sgi/libnurbs/nurbtess/polyUtil.h | 47
src/glu/sgi/libnurbs/nurbtess/primitiveStream.cc | 192
src/glu/sgi/libnurbs/nurbtess/primitiveStream.h | 109
src/glu/sgi/libnurbs/nurbtess/quicksort.cc | 77
src/glu/sgi/libnurbs/nurbtess/quicksort.h | 42
src/glu/sgi/libnurbs/nurbtess/rectBlock.cc | 196
src/glu/sgi/libnurbs/nurbtess/rectBlock.h | 82
src/glu/sgi/libnurbs/nurbtess/sampleComp.cc | 371
src/glu/sgi/libnurbs/nurbtess/sampleComp.h | 86
src/glu/sgi/libnurbs/nurbtess/sampleCompBot.cc | 844 -
src/glu/sgi/libnurbs/nurbtess/sampleCompBot.h | 138
src/glu/sgi/libnurbs/nurbtess/sampleCompRight.cc | 644
src/glu/sgi/libnurbs/nurbtess/sampleCompRight.h | 117
src/glu/sgi/libnurbs/nurbtess/sampleCompTop.cc | 1030 -
src/glu/sgi/libnurbs/nurbtess/sampleCompTop.h | 67
src/glu/sgi/libnurbs/nurbtess/sampleMonoPoly.cc | 2427 ---
src/glu/sgi/libnurbs/nurbtess/sampleMonoPoly.h | 184
src/glu/sgi/libnurbs/nurbtess/sampledLine.cc | 182
src/glu/sgi/libnurbs/nurbtess/sampledLine.h | 71
src/glu/sgi/libnurbs/nurbtess/searchTree.cc | 282
src/glu/sgi/libnurbs/nurbtess/searchTree.h | 61
src/glu/sgi/libnurbs/nurbtess/zlassert.h | 34
src/glu/sgi/libtess/README | 446
src/glu/sgi/libtess/alg-outline | 228
src/glu/sgi/libtess/dict-list.h | 100
src/glu/sgi/libtess/dict.c | 111
src/glu/sgi/libtess/dict.h | 100
src/glu/sgi/libtess/geom.c | 264
src/glu/sgi/libtess/geom.h | 84
src/glu/sgi/libtess/memalloc.c | 55
src/glu/sgi/libtess/memalloc.h | 54
src/glu/sgi/libtess/mesh.c | 798 -
src/glu/sgi/libtess/mesh.h | 266
src/glu/sgi/libtess/normal.c | 257
src/glu/sgi/libtess/normal.h | 45
src/glu/sgi/libtess/priorityq-heap.c | 256
src/glu/sgi/libtess/priorityq-heap.h | 107
src/glu/sgi/libtess/priorityq-sort.h | 117
src/glu/sgi/libtess/priorityq.c | 260
src/glu/sgi/libtess/priorityq.h | 117
src/glu/sgi/libtess/render.c | 502
src/glu/sgi/libtess/render.h | 52
src/glu/sgi/libtess/sweep.c | 1361 -
src/glu/sgi/libtess/sweep.h | 77
src/glu/sgi/libtess/tess.c | 632
src/glu/sgi/libtess/tess.h | 165
src/glu/sgi/libtess/tessmono.c | 201
src/glu/sgi/libtess/tessmono.h | 71
src/glu/sgi/libutil/error.c | 81
src/glu/sgi/libutil/glue.c | 93
src/glu/sgi/libutil/gluint.h | 48
src/glu/sgi/libutil/mipmap.c | 8940 ------------
src/glu/sgi/libutil/project.c | 359
src/glu/sgi/libutil/quad.c | 1155 -
src/glu/sgi/libutil/registry.c | 91
src/glu/sgi/mesaglu.opt | 67
src/mesa/drivers/dri/common/drisw_util.c | 12
src/mesa/drivers/dri/common/xmlconfig.c | 30
src/mesa/drivers/dri/i915/i830_context.c | 2
src/mesa/drivers/dri/i915/i915_context.c | 6
src/mesa/drivers/dri/i965/brw_context.c | 2
src/mesa/drivers/dri/i965/brw_fs.cpp | 2
src/mesa/drivers/dri/i965/brw_state_cache.c | 2
src/mesa/drivers/dri/intel/intel_fbo.c | 2
src/mesa/drivers/dri/intel/intel_regions.h | 26
src/mesa/drivers/dri/intel/intel_screen.c | 161
src/mesa/drivers/dri/nouveau/nouveau_bufferobj.c | 8
src/mesa/drivers/dri/nouveau/nouveau_fbo.c | 2
src/mesa/drivers/dri/nouveau/nouveau_screen.c | 2
src/mesa/drivers/dri/nouveau/nv04_context.c | 2
src/mesa/drivers/dri/nouveau/nv10_context.c | 2
src/mesa/drivers/dri/nouveau/nv20_context.c | 2
src/mesa/drivers/dri/r200/r200_context.c | 4
src/mesa/drivers/dri/r200/r200_state_init.c | 4
src/mesa/drivers/dri/radeon/radeon_common_context.c | 6
src/mesa/drivers/dri/radeon/radeon_context.c | 4
src/mesa/drivers/dri/radeon/radeon_dma.c | 14
src/mesa/drivers/dri/radeon/radeon_fbo.c | 2
src/mesa/drivers/dri/radeon/radeon_queryobj.h | 2
src/mesa/drivers/dri/radeon/radeon_screen.c | 18
src/mesa/drivers/dri/radeon/radeon_state_init.c | 4
src/mesa/drivers/dri/radeon/radeon_texture.c | 2
src/mesa/drivers/dri/swrast/swrast.c | 6
src/mesa/drivers/x11/xfonts.c | 4
src/mesa/drivers/x11/xm_api.c | 4
src/mesa/drivers/x11/xm_buffer.c | 2
src/mesa/main/api_arrayelt.c | 4
src/mesa/main/attrib.c | 10
src/mesa/main/errors.c | 6
src/mesa/main/eval.c | 60
src/mesa/main/imports.h | 153
src/mesa/main/macros.h | 32
src/mesa/main/matrix.c | 4
src/mesa/main/renderbuffer.c | 6
src/mesa/main/samplerobj.c | 2
src/mesa/main/syncobj.c | 8
src/mesa/main/teximage.c | 2
src/mesa/program/nvfragparse.c | 4
src/mesa/program/nvvertparse.c | 2
src/mesa/state_tracker/st_cb_fbo.c | 2
src/mesa/state_tracker/st_cb_syncobj.c | 2
src/mesa/state_tracker/st_glsl_to_tgsi.cpp | 16
src/mesa/state_tracker/st_manager.c | 2
src/mesa/state_tracker/st_mesa_to_tgsi.c | 10
src/mesa/state_tracker/st_program.c | 12
src/mesa/swrast/s_context.c | 14
src/mesa/swrast/s_renderbuffer.c | 2
src/mesa/swrast/s_texcombine.c | 2
src/mesa/swrast/s_zoom.c | 2
src/mesa/swrast_setup/ss_context.c | 4
src/mesa/tnl/t_context.c | 4
src/mesa/tnl/t_vb_fog.c | 4
src/mesa/tnl/t_vb_light.c | 4
src/mesa/tnl/t_vb_program.c | 4
src/mesa/tnl/t_vb_texgen.c | 12
src/mesa/tnl/t_vb_texmat.c | 4
src/mesa/tnl/t_vb_vertex.c | 4
src/mesa/tnl/t_vertex.c | 4
src/mesa/vbo/vbo_context.c | 2
src/mesa/vbo/vbo_save.c | 4
src/mesa/vbo/vbo_save_api.c | 8
329 files changed, 939 insertions(+), 58964 deletions(-)
New commits:
commit 29621fba47e76e8d0c94eecbfa3f27fb80c287a1
Author: Timo Aaltonen <tjaal...@ubuntu.com>
Date: Tue Sep 4 17:22:38 2012 +0300
control: Add libdrm-dev to mesa-common-dev Depends.
diff --git a/debian/changelog b/debian/changelog
index 34428f0..c9b9f16 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -33,6 +33,7 @@ mesa (9.0~git20120903.e1673d20-1) UNRELEASED; urgency=low
* not-installed: Updated.
* Update symbols for libgles2-mesa
* libegl1-mesa-drivers.install.linux: Bump libwayland-egl.so version
+ * control: Add libdrm-dev to mesa-common-dev Depends.
[ Steve Langasek ]
* Install all dri drivers from the DESTDIR tree, instead of copying them
diff --git a/debian/control b/debian/control
index 5477756..e9eefb6 100644
--- a/debian/control
+++ b/debian/control
@@ -734,6 +734,7 @@ Architecture: any
Replaces: xlibmesa-gl-dev (<< 1:7), xlibosmesa-dev, libgl1-mesa-swx11-dev (<<
6.5.2), libgl1-mesa-dev (<< 7.5~rc4-2)
Depends:
libx11-dev,
+ libdrm-dev [!hurd-any],
${misc:Depends},
Description: Developer documentation for Mesa
This package includes the specifications for the Mesa-specific OpenGL
commit 99b54968abf02eb14ef4289bd30d1a3b6966bf38
Author: Timo Aaltonen <tjaal...@ubuntu.com>
Date: Tue Sep 4 17:20:38 2012 +0300
remove bin/install-sh on clean
diff --git a/debian/rules b/debian/rules
index 0319d2f..4346b68 100755
--- a/debian/rules
+++ b/debian/rules
@@ -222,7 +222,7 @@ clean: unpatch
rm -rf configure bin/config.guess bin/config.sub config.h.in
rm -rf $$(find -name Makefile.in)
rm -rf aclocal.m4 bin/missing bin/depcomp install-sh bin/ltmain.sh
- rm -f bin/ar-lib bin/compile bin/ylwrap
+ rm -f bin/ar-lib bin/compile bin/ylwrap bin/install-sh
rm -rf $(STAMP_DIR)
for file in debian/*.in; do rm -f $${file%%.in}; done
rm -f src/glsl/builtins/tools/texture_builtins.pyc
commit 41d5a68a0c12dac252c29af70d2a116afd60fa2b
Author: Timo Aaltonen <tjaal...@ubuntu.com>
Date: Tue Sep 4 17:02:56 2012 +0300
libegl1-mesa-drivers.install.linux: Bump libwayland-egl.so version
diff --git a/debian/changelog b/debian/changelog
index aeee8bb..34428f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -32,6 +32,7 @@ mesa (9.0~git20120903.e1673d20-1) UNRELEASED; urgency=low
* rules: Disable dri for the swx11 targets.
* not-installed: Updated.
* Update symbols for libgles2-mesa
+ * libegl1-mesa-drivers.install.linux: Bump libwayland-egl.so version
[ Steve Langasek ]
* Install all dri drivers from the DESTDIR tree, instead of copying them
diff --git a/debian/libegl1-mesa-drivers.install.linux.in
b/debian/libegl1-mesa-drivers.install.linux.in
index 5001e0a..2c4c266 100644
--- a/debian/libegl1-mesa-drivers.install.linux.in
+++ b/debian/libegl1-mesa-drivers.install.linux.in
@@ -3,4 +3,4 @@ dri/usr/lib/${DEB_HOST_MULTIARCH}/egl/egl_gallium.so
usr/lib/${DEB_HOST_MULTIARC
# Wayland support, only on Linux:
dri/usr/lib/${DEB_HOST_MULTIARCH}/libwayland-egl.so.1
usr/lib/${DEB_HOST_MULTIARCH}
-dri/usr/lib/${DEB_HOST_MULTIARCH}/libwayland-egl.so.1.0
usr/lib/${DEB_HOST_MULTIARCH}
+dri/usr/lib/${DEB_HOST_MULTIARCH}/libwayland-egl.so.1.0.0
usr/lib/${DEB_HOST_MULTIARCH}
commit 24cc3880d5fd3ffb9b4526eb9fef8e44657d3f7b
Author: Timo Aaltonen <tjaal...@ubuntu.com>
Date: Tue Sep 4 17:01:49 2012 +0300
Update symbols for libgles2-mesa
diff --git a/debian/changelog b/debian/changelog
index 224e30d..aeee8bb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -31,6 +31,7 @@ mesa (9.0~git20120903.e1673d20-1) UNRELEASED; urgency=low
off upstream.
* rules: Disable dri for the swx11 targets.
* not-installed: Updated.
+ * Update symbols for libgles2-mesa
[ Steve Langasek ]
* Install all dri drivers from the DESTDIR tree, instead of copying them
diff --git a/debian/libgles2-mesa.symbols b/debian/libgles2-mesa.symbols
index b561787..8f0be1a 100644
--- a/debian/libgles2-mesa.symbols
+++ b/debian/libgles2-mesa.symbols
@@ -6,6 +6,7 @@ libGLESv2.so.2 libgles2-mesa #MINVER# | libgles2
glBindFramebuffer@Base 7.8.1
glBindRenderbuffer@Base 7.8.1
glBindTexture@Base 7.8.1
+ glBindVertexArrayOES@Base 9.0~0
glBlendColor@Base 7.8.1
glBlendEquation@Base 7.8.1
glBlendEquationSeparate@Base 7.8.1
@@ -36,6 +37,7 @@ libGLESv2.so.2 libgles2-mesa #MINVER# | libgles2
glDeleteRenderbuffers@Base 7.8.1
glDeleteShader@Base 7.8.1
glDeleteTextures@Base 7.8.1
+ glDeleteVertexArraysOES@Base 9.0~0
glDepthFunc@Base 7.8.1
glDepthMask@Base 7.8.1
glDepthRangef@Base 7.8.1
@@ -59,6 +61,7 @@ libGLESv2.so.2 libgles2-mesa #MINVER# | libgles2
glGenFramebuffers@Base 7.8.1
glGenRenderbuffers@Base 7.8.1
glGenTextures@Base 7.8.1
+ glGenVertexArraysOES@Base 9.0~0
glGenerateMipmap@Base 7.8.1
glGetActiveAttrib@Base 7.8.1
glGetActiveUniform@Base 7.8.1
@@ -96,6 +99,7 @@ libGLESv2.so.2 libgles2-mesa #MINVER# | libgles2
glIsRenderbuffer@Base 7.8.1
glIsShader@Base 7.8.1
glIsTexture@Base 7.8.1
+ glIsVertexArrayOES@Base 9.0~0
glLineWidth@Base 7.8.1
glLinkProgram@Base 7.8.1
glMapBufferOES@Base 7.8.1
commit b26e0d62b6463db79ee43b8807b1e5b6ba9e7442
Author: Timo Aaltonen <tjaal...@ubuntu.com>
Date: Tue Sep 4 16:58:32 2012 +0300
not-installed: Updated.
diff --git a/debian/changelog b/debian/changelog
index 044bb93..224e30d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -30,6 +30,7 @@ mesa (9.0~git20120903.e1673d20-1) UNRELEASED; urgency=low
* control, rules, libglu*: Remove libglu packaging, since it's been split
off upstream.
* rules: Disable dri for the swx11 targets.
+ * not-installed: Updated.
[ Steve Langasek ]
* Install all dri drivers from the DESTDIR tree, instead of copying them
diff --git a/debian/not-installed b/debian/not-installed
index afbf7dc..5ff192f 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -2,9 +2,7 @@
# Common list:
NOT_INSTALLED := \
- dri/usr/include/GL/glu.h \
- dri/usr/include/GL/glu_mangle.h \
- dri/usr/include/GL/osmesa.h \
+ dri/etc/drirc \
dri/usr/include/GL/vms_x_fix.h \
dri/usr/include/GL/wglext.h \
dri/usr/include/GL/wmesa.h \
@@ -16,6 +14,7 @@ NOT_INSTALLED := \
usr/include/GL/glxext.h \
usr/include/GL/glx.h \
usr/include/GL/glx_mangle.h \
+ usr/include/GL/osmesa.h \
usr/include/GL/vms_x_fix.h \
usr/include/GL/wglext.h \
usr/include/GL/wmesa.h
@@ -23,13 +22,9 @@ NOT_INSTALLED := \
# Architecture-specific additional files:
NOT_INSTALLED_i386 = \
usr/lib/*/i686/cmov/libGL.so \
- usr/lib/*/i686/cmov/libGLU.so \
- usr/lib/*/i686/cmov/libGLU.so.1 \
- usr/lib/*/i686/cmov/libGLU.so.1.* \
usr/lib/*/i686/cmov/libOSMesa.so \
usr/lib/*/i686/cmov/libOSMesa.so.6 \
usr/lib/*/i686/cmov/libOSMesa.so.6.* \
- usr/lib/*/i686/cmov/pkgconfig/glu.pc \
usr/lib/*/i686/cmov/pkgconfig/gl.pc \
usr/lib/*/i686/cmov/pkgconfig/osmesa.pc
commit 61f18fe2705c79b5e63fbb30f0a40b04be154109
Author: Timo Aaltonen <tjaal...@ubuntu.com>
Date: Tue Sep 4 16:22:59 2012 +0300
fix 04_osmesa_version.diff
diff --git a/debian/patches/04_osmesa_version.diff
b/debian/patches/04_osmesa_version.diff
index 11b6b57..deac406 100644
--- a/debian/patches/04_osmesa_version.diff
+++ b/debian/patches/04_osmesa_version.diff
@@ -9,3 +9,12 @@
lib@OSMESA_LIB@_la_LIBADD = \
$(top_builddir)/src/mesa/libmesa.la \
$(top_builddir)/src/mapi/glapi/libglapi.la
+@@ -46,7 +46,7 @@
+ all-local: lib@OSMESA_LIB@.la
+ $(MKDIR_P) $(top_builddir)/$(LIB_DIR);
+ ln -f .libs/lib@OSMESA_LIB@.so
$(top_builddir)/$(LIB_DIR)/lib@OSMESA_LIB@.so;
+- ln -f .libs/lib@OSMESA_LIB@.so.@VERSION@
$(top_builddir)/$(LIB_DIR)/lib@OSMESA_LIB@.so.@VERSION@;
++ ln -f .libs/lib@OSMESA_LIB@.so.6.5.3
$(top_builddir)/$(LIB_DIR)/lib@OSMESA_LIB@.so.6.5.3;
+ endif
+
+ pkgconfigdir = $(libdir)/pkgconfig
commit 7199ed7de7b70d279ae6910740339c6cd8f0574a
Author: Timo Aaltonen <tjaal...@ubuntu.com>
Date: Tue Sep 4 16:19:23 2012 +0300
rules: Disable dri for the swx11 targets.
diff --git a/debian/changelog b/debian/changelog
index 7ceb3a0..044bb93 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,6 +29,7 @@ mesa (9.0~git20120903.e1673d20-1) UNRELEASED; urgency=low
llvmpipe with --with-llvm-shared-libs. Patch from fdo bug #52617.
* control, rules, libglu*: Remove libglu packaging, since it's been split
off upstream.
+ * rules: Disable dri for the swx11 targets.
[ Steve Langasek ]
* Install all dri drivers from the DESTDIR tree, instead of copying them
diff --git a/debian/rules b/debian/rules
index a01a5c4..0319d2f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -129,6 +129,7 @@ confflags-dri = \
$(confflags-common)
confflags-swx11 = \
+ --disable-dri \
--disable-egl \
--with-gallium-drivers= \
--enable-xlib-glx \
@@ -138,6 +139,7 @@ confflags-swx11 = \
CXXFLAGS="$(CXXFLAGS)"
confflags-swx11-static = \
+ --disable-dri \
--disable-egl \
--with-gallium-drivers= \
--enable-xlib-glx \
@@ -148,6 +150,7 @@ confflags-swx11-static = \
CXXFLAGS="$(CXXFLAGS)"
confflags-swx11+glu-i386-i686 = \
+ --disable-dri \
--disable-egl \
--with-gallium-drivers= \
--enable-xlib-glx \
commit c46e5618ed8a960f5dbd859f42bd2270ddee7afc
Author: Timo Aaltonen <tjaal...@ubuntu.com>
Date: Tue Sep 4 09:55:23 2012 +0300
bump libdrm-dev build-dep to 2.4.39
diff --git a/debian/changelog b/debian/changelog
index c6f60b9..7ceb3a0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,7 +11,7 @@ mesa (9.0~git20120903.e1673d20-1) UNRELEASED; urgency=low
* control: Added libtool to build-depends.
* rules: Drop special handling of config.{guess,sub}, not needed anymore.
* rules, libosmesa*: Build only the 32bit OSMesa library.
- * control: Bump libdrm build-dep to 2.4.38.
+ * control: Bump libdrm build-dep to 2.4.39.
* control: Bump libwayland-dev build-dep to 0.95.
* rules: Update the clean target.
* rules: Add --disable-shared-glapi to the swx11 targets.
diff --git a/debian/control b/debian/control
index dacce1f..5477756 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends:
debhelper (>= 8.1.3),
quilt (>= 0.40),
pkg-config,
- libdrm-dev (>= 2.4.38) [!hurd-any],
+ libdrm-dev (>= 2.4.39) [!hurd-any],
libx11-dev,
xutils-dev,
x11proto-gl-dev (>= 1.4.14),
commit 87016b7c9370d69e979e98b5d19dc2d0d12357cc
Author: Timo Aaltonen <tjaal...@ubuntu.com>
Date: Tue Sep 4 09:51:23 2012 +0300
clean target cleanup: no reason to symlink to minstall anymore
diff --git a/debian/rules b/debian/rules
index d4a719d..a01a5c4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -222,7 +222,6 @@ clean: unpatch
rm -f bin/ar-lib bin/compile bin/ylwrap
rm -rf $(STAMP_DIR)
for file in debian/*.in; do rm -f $${file%%.in}; done
- ln -sf minstall bin/install-sh
rm -f src/glsl/builtins/tools/texture_builtins.pyc
rm -f src/mapi/glapi/gen/*.pyc
rm -f src/mesa/main/*.pyc
commit 163908d6d60363fead8867c87fd44df00fcfc6e0
Author: Timo Aaltonen <tjaal...@ubuntu.com>
Date: Mon Sep 3 16:42:40 2012 +0300
refresh patches
diff --git a/debian/patches/02_use-ieee-fp-on-s390-and-m68k.patch
b/debian/patches/02_use-ieee-fp-on-s390-and-m68k.patch
index d2376e2..d3d6c1d 100644
--- a/debian/patches/02_use-ieee-fp-on-s390-and-m68k.patch
+++ b/debian/patches/02_use-ieee-fp-on-s390-and-m68k.patch
@@ -6,11 +6,9 @@ This patch by David Nusinow.
src/mesa/main/compiler.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
-Index: mesa/src/mesa/main/compiler.h
-===================================================================
---- mesa.orig/src/mesa/main/compiler.h 2012-01-18 16:04:58.338654818 +0200
-+++ mesa/src/mesa/main/compiler.h 2012-01-18 16:05:00.930732513 +0200
-@@ -369,8 +369,9 @@
+--- a/src/mesa/main/compiler.h
++++ b/src/mesa/main/compiler.h
+@@ -366,8 +366,9 @@
* USE_IEEE: Determine if we're using IEEE floating point
*/
#if defined(__i386__) || defined(__386__) || defined(__sparc__) || \
diff --git a/debian/patches/04_osmesa_version.diff
b/debian/patches/04_osmesa_version.diff
index ffd47e0..11b6b57 100644
--- a/debian/patches/04_osmesa_version.diff
+++ b/debian/patches/04_osmesa_version.diff
@@ -1,11 +1,11 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -1325,7 +1325,7 @@
- OSMESA_PC_LIB_PRIV="-lm -lpthread $SELINUX_LIBS $DLOPEN_LIBS"
- fi
+--- a/src/mesa/drivers/osmesa/Makefile.am
++++ b/src/mesa/drivers/osmesa/Makefile.am
+@@ -35,7 +35,7 @@
--OSMESA_VERSION=`echo "$VERSION" | $SED 's/\./:/g'`
-+OSMESA_VERSION="6:5:3"
+ lib@OSMESA_LIB@_la_SOURCES = osmesa.c
- AC_SUBST([OSMESA_LIB_DEPS])
- AC_SUBST([OSMESA_MESA_DEPS])
+-lib@OSMESA_LIB@_la_LDFLAGS = -module -version-number @VERSION_NUMBER@
-no-undefined
++lib@OSMESA_LIB@_la_LDFLAGS = -module -version-number 6:5:3 -no-undefined
+ lib@OSMESA_LIB@_la_LIBADD = \
+ $(top_builddir)/src/mesa/libmesa.la \
+ $(top_builddir)/src/mapi/glapi/libglapi.la
diff --git a/debian/patches/06_kfreebsd-ftbfs.diff
b/debian/patches/06_kfreebsd-ftbfs.diff
index cab24ed..b6618a6 100644
--- a/debian/patches/06_kfreebsd-ftbfs.diff
+++ b/debian/patches/06_kfreebsd-ftbfs.diff
@@ -7,7 +7,7 @@ Debian bug: http://bugs.debian.org/524690
--- a/configure.ac
+++ b/configure.ac
-@@ -1160,7 +1160,7 @@
+@@ -1022,7 +1022,7 @@
;;
esac
;;
diff --git a/debian/patches/10-hurd-configure-tweaks.diff
b/debian/patches/10-hurd-configure-tweaks.diff
index 9a01f9f..984e17d 100644
--- a/debian/patches/10-hurd-configure-tweaks.diff
+++ b/debian/patches/10-hurd-configure-tweaks.diff
@@ -3,7 +3,7 @@ Enable x86 assembler on Hurd.
Thanks to Pino Toscano.
--- a/configure.ac
+++ b/configure.ac
-@@ -454,7 +454,7 @@
+@@ -438,7 +438,7 @@
case "$host_cpu" in
i?86)
case "$host_os" in
diff --git a/debian/patches/13-llvm-config-pick-a-version.diff
b/debian/patches/13-llvm-config-pick-a-version.diff
index 4a60c1e..4e85ff6 100644
--- a/debian/patches/13-llvm-config-pick-a-version.diff
+++ b/debian/patches/13-llvm-config-pick-a-version.diff
@@ -4,7 +4,7 @@ receives bug fixes quickly, so pick 3.1 for now.
--- a/configure.ac
+++ b/configure.ac
-@@ -1822,9 +1822,9 @@
+@@ -1632,9 +1632,9 @@
fi
if test "x$enable_gallium_llvm" = xyes; then
if test "x$llvm_prefix" != x; then
commit 02316a8caf695d947bbc55e63fdb7768ab268f03
Author: Timo Aaltonen <tjaal...@ubuntu.com>
Date: Mon Sep 3 16:37:00 2012 +0300
control, rules, libglu*: Remove libglu packaging, since it's been split off
upstream.
diff --git a/debian/changelog b/debian/changelog
index 41271da..c6f60b9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,6 +27,8 @@ mesa (9.0~git20120903.e1673d20-1) UNRELEASED; urgency=low
* rules: Build llvm shared libs on platforms that support llvm.
* Added 15-fix-llvmpipe-test-linking.diff: Fix link failure when building
llvmpipe with --with-llvm-shared-libs. Patch from fdo bug #52617.
+ * control, rules, libglu*: Remove libglu packaging, since it's been split
+ off upstream.
[ Steve Langasek ]
* Install all dri drivers from the DESTDIR tree, instead of copying them
diff --git a/debian/control b/debian/control
index 581df44..dacce1f 100644
--- a/debian/control
+++ b/debian/control
@@ -773,45 +773,4 @@ Description: Mesa Off-screen rendering extension --
development files
.
For more information on OSmesa see the libosmesa6 package.
-Package: libglu1-mesa
-Section: libs
-Architecture: any
-Depends:
- ${shlibs:Depends},
- ${misc:Depends},
-Provides: libglu1
-Conflicts: mesag3 (<< 5.0.0-1), xlibmesa3, libglu1
-Replaces: libglu1
-Pre-Depends: ${misc:Pre-Depends}
-Multi-Arch: same
-Description: Mesa OpenGL utility library (GLU)
- GLU offers simple interfaces for building mipmaps; checking for the
- presence of extensions in the OpenGL (or other libraries which follow
- the same conventions for advertising extensions); drawing
- piecewise-linear curves, NURBS, quadrics and other primitives
- (including, but not limited to, teapots); tesselating surfaces; setting
- up projection matrices and unprojecting screen coordinates to world
- coordinates.
- .
- On Linux, this library is also known as libGLU or libGLU.so.1.
- .
- This package provides the SGI implementation of GLU shipped with the
- Mesa package (ergo the "-mesa" suffix).
-
-Package: libglu1-mesa-dev
-Section: libdevel
-Architecture: any
-Depends:
- libglu1-mesa (= ${binary:Version}),
- libgl1-mesa-dev | libgl-dev,
- ${misc:Depends},
-Provides: libglu-dev, xlibmesa-glu-dev
-Conflicts: mesag-dev (<< 5.0.0-1), mesa-glide2-dev (<< 5.0.0-1),
mesag3+ggi-dev (<< 5.0.0-1), xlibmesa-dev
-Replaces: libglu-dev
-Description: Mesa OpenGL utility library -- development files
- Includes headers and static libraries for compiling programs with GLU.
- .
- For a complete description of GLU, please look at the libglu1-mesa
- package.
-
# vim: tw=0
diff --git a/debian/libglu1-mesa-dev.install.in
b/debian/libglu1-mesa-dev.install.in
deleted file mode 100644
index e577f6a..0000000
--- a/debian/libglu1-mesa-dev.install.in
+++ /dev/null
@@ -1,5 +0,0 @@
-usr/include/GL/glu.h
-usr/include/GL/glu_mangle.h
-usr/lib/${DEB_HOST_MULTIARCH}/libGLU.a
-usr/lib/${DEB_HOST_MULTIARCH}/libGLU.so
-usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/glu.pc
diff --git a/debian/libglu1-mesa.install.in b/debian/libglu1-mesa.install.in
deleted file mode 100644
index 21c51c0..0000000
--- a/debian/libglu1-mesa.install.in
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/${DEB_HOST_MULTIARCH}/libGLU.so.*
diff --git a/debian/libglu1-mesa.lintian-overrides
b/debian/libglu1-mesa.lintian-overrides
deleted file mode 100644
index ad26285..0000000
--- a/debian/libglu1-mesa.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-package-name-doesnt-match-sonames libGLU1
diff --git a/debian/libglu1-mesa.shlibs b/debian/libglu1-mesa.shlibs
deleted file mode 100644
index 647fc5b..0000000
--- a/debian/libglu1-mesa.shlibs
+++ /dev/null
@@ -1 +0,0 @@
-libGLU 1 libglu1-mesa | libglu1
diff --git a/debian/rules b/debian/rules
index 23e6d44..d4a719d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -37,8 +37,8 @@ endif
include debian/not-installed
# build the following configurations by default
-CONFIGS = swx11+glu \
- swx11+glu-static \
+CONFIGS = swx11 \
+ swx11-static \
dri
ifeq ($(DEB_HOST_ARCH_CPU), i386)
@@ -53,7 +53,6 @@ QUILT_STAMPFN = $(STAMP_DIR)/patch
include /usr/share/quilt/quilt.make
confflags-common = \
- --disable-glu \
CFLAGS="$(CFLAGS)" \
CXXFLAGS="$(CXXFLAGS)"
@@ -129,7 +128,7 @@ confflags-dri = \
$(confflags_OPENVG) \
$(confflags-common)
-confflags-swx11+glu = \
+confflags-swx11 = \
--disable-egl \
--with-gallium-drivers= \
--enable-xlib-glx \
@@ -138,7 +137,7 @@ confflags-swx11+glu = \
CFLAGS="$(CFLAGS)" \
CXXFLAGS="$(CXXFLAGS)"
-confflags-swx11+glu-static = \
+confflags-swx11-static = \
--disable-egl \
--with-gallium-drivers= \
--enable-xlib-glx \
commit 7b9adab4cd1823d6125289a43d095ace2ee3f72b
Author: Timo Aaltonen <tjaal...@ubuntu.com>
Date: Mon Sep 3 15:49:17 2012 +0300
new snapshot
diff --git a/debian/changelog b/debian/changelog
index 98e67bc..41271da 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mesa (9.0~git20120830.2d2f1fd1-1) UNRELEASED; urgency=low
+mesa (9.0~git20120903.e1673d20-1) UNRELEASED; urgency=low
[ Julien Cristau ]
* Use xz for all binary packages not just *-dbg.
commit e1673d200133b49685d07cc81826bfe4a61c0fe6
Author: Christian König <deathsim...@vodafone.de>
Date: Wed Aug 29 13:41:47 2012 +0200
radeonsi: disable array-textures for now
Signed-off-by: Christian König <deathsim...@vodafone.de>
diff --git a/src/gallium/drivers/radeonsi/radeonsi_pipe.c
b/src/gallium/drivers/radeonsi/radeonsi_pipe.c
index f750633..48b9a3e 100644
--- a/src/gallium/drivers/radeonsi/radeonsi_pipe.c
+++ b/src/gallium/drivers/radeonsi/radeonsi_pipe.c
@@ -367,7 +367,7 @@ static int r600_get_param(struct pipe_screen* pscreen, enum
pipe_cap param)
case PIPE_CAP_MAX_TEXTURE_CUBE_LEVELS:
return 15;
case PIPE_CAP_MAX_TEXTURE_ARRAY_LAYERS:
- return rscreen->info.drm_minor >= 9 ? 16384 : 0;
+ return /*rscreen->info.drm_minor >= 9 ? 16384 :*/ 0;
case PIPE_CAP_MAX_COMBINED_SAMPLERS:
return 32;
commit aa5daa61a19d002c48845ad28fd86872b145d46d
Author: Christian König <deathsim...@vodafone.de>
Date: Mon Aug 27 17:36:08 2012 +0200
radeonsi: disable Z16 for now
It's causing crashes.
Signed-off-by: Christian König <deathsim...@vodafone.de>
Reviewed-by: Alex Deucher <alexander.deuc...@amd.com>
diff --git a/src/gallium/drivers/radeonsi/si_state.c
b/src/gallium/drivers/radeonsi/si_state.c
index b7a3cf4..c01c3f6 100644
--- a/src/gallium/drivers/radeonsi/si_state.c
+++ b/src/gallium/drivers/radeonsi/si_state.c
@@ -1045,8 +1045,8 @@ static unsigned si_colorformat_max_comp_size(uint32_t
colorformat)
static uint32_t si_translate_dbformat(enum pipe_format format)
{
switch (format) {
- case PIPE_FORMAT_Z16_UNORM:
- return V_028040_Z_16;
+ //case PIPE_FORMAT_Z16_UNORM:
+ // return V_028040_Z_16;
case PIPE_FORMAT_Z24X8_UNORM:
case PIPE_FORMAT_Z24_UNORM_S8_UINT:
return V_028040_Z_24; /* XXX no longer supported on SI */
commit 74a55392b6dafbce689a3d5a8d34735e38bb662a
Author: Christian König <deathsim...@vodafone.de>
Date: Mon Aug 27 11:14:26 2012 +0200
radeonsi: disable NPOT textures for now
Looks like we have an alignment issue with NPOT textures
and mipmaps. So disable NPOT textures until we figure out
what is going wrong here.
Signed-off-by: Christian König <deathsim...@vodafone.de>
Reviewed-by: Alex Deucher <alexander.deuc...@amd.com>
diff --git a/src/gallium/drivers/radeonsi/radeonsi_pipe.c
b/src/gallium/drivers/radeonsi/radeonsi_pipe.c
index abcdfbf..f750633 100644
--- a/src/gallium/drivers/radeonsi/radeonsi_pipe.c
+++ b/src/gallium/drivers/radeonsi/radeonsi_pipe.c
@@ -292,7 +292,6 @@ static int r600_get_param(struct pipe_screen* pscreen, enum
pipe_cap param)
switch (param) {
/* Supported features (boolean caps). */
- case PIPE_CAP_NPOT_TEXTURES:
case PIPE_CAP_TWO_SIDED_STENCIL:
case PIPE_CAP_MAX_DUAL_SOURCE_RENDER_TARGETS:
case PIPE_CAP_ANISOTROPIC_FILTER:
@@ -333,6 +332,7 @@ static int r600_get_param(struct pipe_screen* pscreen, enum
pipe_cap param)
return debug_get_bool_option("R600_GLSL130", FALSE) ? 130 : 120;
/* Unsupported features. */
+ case PIPE_CAP_NPOT_TEXTURES:
case PIPE_CAP_TGSI_INSTANCEID:
case PIPE_CAP_TGSI_FS_COORD_ORIGIN_LOWER_LEFT:
case PIPE_CAP_TGSI_FS_COORD_PIXEL_CENTER_INTEGER:
commit e7723b5bdfe7dc725dd29a725c4637a7f34eda83
Author: Christian König <deathsim...@vodafone.de>
Date: Fri Aug 24 12:55:34 2012 +0200
radeonsi: handle indirect constants gracefully
It's not supported yet, so at least don't try to crash the box.
Signed-off-by: Christian König <deathsim...@vodafone.de>
Reviewed-by: Alex Deucher <alexander.deuc...@amd.com>
diff --git a/src/gallium/drivers/radeonsi/radeonsi_shader.c
b/src/gallium/drivers/radeonsi/radeonsi_shader.c
index 2f417ec..9734ab3 100644
--- a/src/gallium/drivers/radeonsi/radeonsi_shader.c
+++ b/src/gallium/drivers/radeonsi/radeonsi_shader.c
@@ -362,6 +362,13 @@ static LLVMValueRef fetch_constant(
LLVMValueRef offset;
LLVMValueRef load;
+ /* currently not supported */
+ if (reg->Register.Indirect) {
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1t8u64-0000si...@vasks.debian.org
