Makefile.am | 2 configs/default | 2 configure.ac | 71 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 314 files changed, 889 insertions(+), 58880 deletions(-)
New commits: commit e1673d200133b49685d07cc81826bfe4a61c0fe6 Author: Christian König <[email protected]> Date: Wed Aug 29 13:41:47 2012 +0200 radeonsi: disable array-textures for now Signed-off-by: Christian König <[email protected]> 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 <[email protected]> Date: Mon Aug 27 17:36:08 2012 +0200 radeonsi: disable Z16 for now It's causing crashes. Signed-off-by: Christian König <[email protected]> Reviewed-by: Alex Deucher <[email protected]> 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 <[email protected]> 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 <[email protected]> Reviewed-by: Alex Deucher <[email protected]> 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 <[email protected]> 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 <[email protected]> Reviewed-by: Alex Deucher <[email protected]> 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) { + assert(0); + load = lp_build_const_int32(base->gallivm, 0); + return bitcast(bld_base, type, load); + } + /* XXX: Assume the pointer to the constant buffer is being stored in * SGPR[0:1] */ const_ptr = use_sgpr(base->gallivm, SGPR_CONST_PTR_F32, 0); commit a96119cc8c9988e3ad97b20bf8f2ca5ded0e7864 Author: Brian Paul <[email protected]> Date: Sat Sep 1 09:47:29 2012 -0600 radeon: fix free/FREE mistake diff --git a/src/mesa/drivers/dri/radeon/radeon_dma.c b/src/mesa/drivers/dri/radeon/radeon_dma.c index 2ffbc6d..9193d13 100644 --- a/src/mesa/drivers/dri/radeon/radeon_dma.c +++ b/src/mesa/drivers/dri/radeon/radeon_dma.c @@ -344,7 +344,7 @@ void radeonReleaseDmaRegions(radeonContextPtr rmesa) { struct radeon_dma_bo *dma_bo; struct radeon_dma_bo *temp; - const int expire_at = ++rmesa->dma.free.expire_counter + DMA_BO_free_TIME; + const int expire_at = ++rmesa->dma.free.expire_counter + DMA_BO_FREE_TIME; const int time = rmesa->dma.free.expire_counter; if (RADEON_DEBUG & RADEON_DMA) { commit 12bf268aab25824fd57266d3f5c666601f1f7ac3 Author: Brian Paul <[email protected]> Date: Sat Sep 1 09:03:24 2012 -0600 vega: include u_debug.h for assert() diff --git a/src/gallium/state_trackers/vega/handle.h b/src/gallium/state_trackers/vega/handle.h index 9ed326d..75f2ee8 100644 --- a/src/gallium/state_trackers/vega/handle.h +++ b/src/gallium/state_trackers/vega/handle.h @@ -35,6 +35,7 @@ #define HANDLE_H #include "pipe/p_compiler.h" +#include "util/u_debug.h" #include "util/u_hash_table.h" #include "util/u_pointer.h" commit fe72a069d1fcce943f315907b4744b63158938b1 Author: Brian Paul <[email protected]> Date: Sat Sep 1 07:47:24 2012 -0600 mesa: s/FREE/free/ v2: replace instances in dri/common/ dirs Reviewed-by: Matt Turner <[email protected]> Reviewed-by: Kenneth Graunke <[email protected]> diff --git a/src/gallium/state_trackers/dri/common/dri_context.c b/src/gallium/state_trackers/dri/common/dri_context.c index 0403826..b91303d 100644 --- a/src/gallium/state_trackers/dri/common/dri_context.c +++ b/src/gallium/state_trackers/dri/common/dri_context.c @@ -159,7 +159,7 @@ dri_create_context(gl_api api, const struct gl_config * visual, if (ctx && ctx->st) ctx->st->destroy(ctx->st); - FREE(ctx); + free(ctx); return GL_FALSE; } @@ -172,7 +172,7 @@ dri_destroy_context(__DRIcontext * cPriv) * driParseConfigFiles allocated values only - the rest * is owned by screen optionCache. */ - FREE(ctx->optionCache.values); + free(ctx->optionCache.values); /* No particular reason to wait for command completion before * destroying a context, but we flush the context here @@ -184,7 +184,7 @@ dri_destroy_context(__DRIcontext * cPriv) if (ctx->pp) pp_free(ctx->pp); - FREE(ctx); + free(ctx); } GLboolean diff --git a/src/gallium/state_trackers/dri/common/dri_screen.c b/src/gallium/state_trackers/dri/common/dri_screen.c index 102a132..b76cb9a 100644 --- a/src/gallium/state_trackers/dri/common/dri_screen.c +++ b/src/gallium/state_trackers/dri/common/dri_screen.c @@ -355,13 +355,13 @@ dri_destroy_option_cache(struct dri_screen * screen) if (screen->optionCache.info) { for (i = 0; i < (1 << screen->optionCache.tableSize); ++i) { - FREE(screen->optionCache.info[i].name); - FREE(screen->optionCache.info[i].ranges); + free(screen->optionCache.info[i].name); + free(screen->optionCache.info[i].ranges); } - FREE(screen->optionCache.info); + free(screen->optionCache.info); } - FREE(screen->optionCache.values); + free(screen->optionCache.values); } void @@ -383,7 +383,7 @@ dri_destroy_screen(__DRIscreen * sPriv) dri_destroy_screen_helper(screen); - FREE(screen); + free(screen); sPriv->driverPrivate = NULL; sPriv->extensions = NULL; } diff --git a/src/gallium/state_trackers/glx/xlib/glx_usefont.c b/src/gallium/state_trackers/glx/xlib/glx_usefont.c index 5dac7a7..f27c35c 100644 --- a/src/gallium/state_trackers/glx/xlib/glx_usefont.c +++ b/src/gallium/state_trackers/glx/xlib/glx_usefont.c @@ -357,7 +357,7 @@ glXUseXFont(Font font, int first, int count, int listbase) glEndList(); } - FREE(bm); + free(bm); XFreeFontInfo(NULL, fs, 1); XFreeGC(dpy, gc); diff --git a/src/gallium/state_trackers/glx/xlib/xm_api.c b/src/gallium/state_trackers/glx/xlib/xm_api.c index ef275b2..3761330 100644 --- a/src/gallium/state_trackers/glx/xlib/xm_api.c +++ b/src/gallium/state_trackers/glx/xlib/xm_api.c @@ -169,7 +169,7 @@ xmesa_init_display( Display *display ) xmdpy->screen = NULL; } if (xmdpy->smapi) { - FREE(xmdpy->smapi); + free(xmdpy->smapi); xmdpy->smapi = NULL; } @@ -800,8 +800,8 @@ XMesaVisual XMesaCreateVisual( Display *display, v->stvis.color_format = choose_pixel_format(v); if (v->stvis.color_format == PIPE_FORMAT_NONE) { - FREE(v->visinfo); - FREE(v); + free(v->visinfo); + free(v); return NULL; } diff --git a/src/gallium/state_trackers/glx/xlib/xm_st.c b/src/gallium/state_trackers/glx/xlib/xm_st.c index f6439dc..ee425ec 100644 --- a/src/gallium/state_trackers/glx/xlib/xm_st.c +++ b/src/gallium/state_trackers/glx/xlib/xm_st.c @@ -279,9 +279,9 @@ xmesa_create_st_framebuffer(XMesaDisplay xmdpy, XMesaBuffer b) xstfb = CALLOC_STRUCT(xmesa_st_framebuffer); if (!stfbi || !xstfb) { if (stfbi) - FREE(stfbi); + free(stfbi); if (xstfb) - FREE(xstfb); + free(xstfb); return NULL; } @@ -314,8 +314,8 @@ xmesa_destroy_st_framebuffer(struct st_framebuffer_iface *stfbi) for (i = 0; i < ST_ATTACHMENT_COUNT; i++) pipe_resource_reference(&xstfb->textures[i], NULL); - FREE(xstfb); - FREE(stfbi); + free(xstfb); + free(stfbi); } void diff --git a/src/mesa/drivers/dri/common/drisw_util.c b/src/mesa/drivers/dri/common/drisw_util.c index 0ec124a..d692748 100644 --- a/src/mesa/drivers/dri/common/drisw_util.c +++ b/src/mesa/drivers/dri/common/drisw_util.c @@ -68,7 +68,7 @@ driCreateNewScreen(int scrn, const __DRIextension **extensions, *driver_configs = driDriverAPI.InitScreen(psp); if (*driver_configs == NULL) { - FREE(psp); + free(psp); return NULL; } @@ -79,7 +79,7 @@ static void driDestroyScreen(__DRIscreen *psp) { if (psp) { driDriverAPI.DestroyScreen(psp); - FREE(psp); + free(psp); } } @@ -178,7 +178,7 @@ driCreateContextAttribs(__DRIscreen *screen, int api, if (!driDriverAPI.CreateContext(mesa_api, modes, pcp, major_version, minor_version, flags, error, shareCtx)) { - FREE(pcp); + free(pcp); return NULL; } @@ -209,7 +209,7 @@ driDestroyContext(__DRIcontext *pcp) { if (pcp) { driDriverAPI.DestroyContext(pcp); - FREE(pcp); + free(pcp); } } @@ -289,7 +289,7 @@ static void dri_put_drawable(__DRIdrawable *pdp) return; driDriverAPI.DestroyBuffer(pdp); - FREE(pdp); + free(pdp); } } @@ -311,7 +311,7 @@ driCreateNewDrawable(__DRIscreen *psp, dri_get_drawable(pdp); if (!driDriverAPI.CreateBuffer(psp, pdp, &config->modes, GL_FALSE)) { - FREE(pdp); + free(pdp); return NULL; } diff --git a/src/mesa/drivers/dri/common/xmlconfig.c b/src/mesa/drivers/dri/common/xmlconfig.c index e48ceb4..9297484 100644 --- a/src/mesa/drivers/dri/common/xmlconfig.c +++ b/src/mesa/drivers/dri/common/xmlconfig.c @@ -382,9 +382,9 @@ static GLboolean parseRanges (driOptionInfo *info, const XML_Char *string) { else range = NULL; } - FREE (cp); + free(cp); if (i < nRanges) { - FREE (ranges); + free(ranges); return GL_FALSE; } else assert (range == NULL); @@ -990,7 +990,7 @@ void driParseConfigFiles (driOptionCache *cache, const driOptionCache *info, } if (filenames[1]) - FREE (filenames[1]); + free(filenames[1]); } void driDestroyOptionInfo (driOptionCache *info) { @@ -999,18 +999,18 @@ void driDestroyOptionInfo (driOptionCache *info) { GLuint i, size = 1 << info->tableSize; for (i = 0; i < size; ++i) { if (info->info[i].name) { - FREE (info->info[i].name); + free(info->info[i].name); if (info->info[i].ranges) - FREE (info->info[i].ranges); + free(info->info[i].ranges); } } - FREE (info->info); + free(info->info); } } void driDestroyOptionCache (driOptionCache *cache) { if (cache->values) - FREE (cache->values); + free(cache->values); } GLboolean driCheckOption (const driOptionCache *cache, const char *name, diff --git a/src/mesa/drivers/dri/i915/i830_context.c b/src/mesa/drivers/dri/i915/i830_context.c index 663909e..3da0745 100644 --- a/src/mesa/drivers/dri/i915/i830_context.c +++ b/src/mesa/drivers/dri/i915/i830_context.c @@ -65,7 +65,7 @@ i830CreateContext(const struct gl_config * mesaVis, if (!intelInitContext(intel, __DRI_API_OPENGL, mesaVis, driContextPriv, sharedContextPrivate, &functions)) { - FREE(i830); + free(i830); return false; } diff --git a/src/mesa/drivers/dri/i915/i915_context.c b/src/mesa/drivers/dri/i915/i915_context.c index 1a0baa2..8ae1e58 100644 --- a/src/mesa/drivers/dri/i915/i915_context.c +++ b/src/mesa/drivers/dri/i915/i915_context.c @@ -167,7 +167,7 @@ i915CreateContext(int api, if (!intelInitContext(intel, api, mesaVis, driContextPriv, sharedContextPrivate, &functions)) { - FREE(i915); + free(i915); *error = __DRI_CTX_ERROR_NO_MEMORY; return false; } @@ -184,7 +184,7 @@ i915CreateContext(int api, if (req_version > max_version) { *error = __DRI_CTX_ERROR_BAD_VERSION; - FREE(i915); + free(i915); return false; } break; @@ -194,7 +194,7 @@ i915CreateContext(int api, break; default: *error = __DRI_CTX_ERROR_BAD_API; - FREE(i915); + free(i915); return false; } diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c index 4e5aed6..1083e28 100644 --- a/src/mesa/drivers/dri/i965/brw_context.c +++ b/src/mesa/drivers/dri/i965/brw_context.c @@ -148,7 +148,7 @@ brwCreateContext(int api, if (!intelInitContext( intel, api, mesaVis, driContextPriv, sharedContextPrivate, &functions )) { printf("%s: failed to init intel context\n", __FUNCTION__); - FREE(brw); + free(brw); *error = __DRI_CTX_ERROR_NO_MEMORY; return false; } diff --git a/src/mesa/drivers/dri/i965/brw_state_cache.c b/src/mesa/drivers/dri/i965/brw_state_cache.c index 8823b22..c39d589 100644 --- a/src/mesa/drivers/dri/i965/brw_state_cache.c +++ b/src/mesa/drivers/dri/i965/brw_state_cache.c @@ -120,7 +120,7 @@ rehash(struct brw_cache *cache) items[c->hash % size] = c; } - FREE(cache->items); + free(cache->items); cache->items = items; cache->size = size; } diff --git a/src/mesa/drivers/dri/intel/intel_screen.c b/src/mesa/drivers/dri/intel/intel_screen.c index 6c53b47..3470db6 100644 --- a/src/mesa/drivers/dri/intel/intel_screen.c +++ b/src/mesa/drivers/dri/intel/intel_screen.c @@ -309,7 +309,7 @@ intel_create_image_from_name(__DRIscreen *screen, cpp, width, height, pitch, name, "image"); if (image->region == NULL) { - FREE(image); + free(image); return NULL; } @@ -371,7 +371,7 @@ static void intel_destroy_image(__DRIimage *image) { intel_region_release(&image->region); - FREE(image); + free(image); } static __DRIimage * @@ -397,7 +397,7 @@ intel_create_image(__DRIscreen *screen, image->region = intel_region_alloc(intelScreen, tiling, cpp, width, height, true); if (image->region == NULL) { - FREE(image); + free(image); return NULL; } @@ -446,7 +446,7 @@ intel_dup_image(__DRIimage *orig_image, void *loaderPrivate) intel_region_reference(&image->region, orig_image->region); if (image->region == NULL) { - FREE(image); + free(image); return NULL; } @@ -543,13 +543,13 @@ intel_from_planar(__DRIimage *parent, int plane, void *loaderPrivate) pitch = stride / cpp; if (offset + height * cpp * pitch > parent->region->bo->size) { _mesa_warning(NULL, "intel_create_sub_image: subimage out of bounds"); - FREE(image); + free(image); return NULL; } image->region = calloc(sizeof(*image->region), 1); if (image->region == NULL) { - FREE(image); + free(image); return NULL; } @@ -639,7 +639,7 @@ intelDestroyScreen(__DRIscreen * sPriv) _mesa_HashDeleteAll(intelScreen->named_regions, nop_callback, NULL); _mesa_DeleteHashTable(intelScreen->named_regions); - FREE(intelScreen); + free(intelScreen); sPriv->driverPrivate = NULL; } @@ -1156,7 +1156,7 @@ intelAllocateBuffer(__DRIscreen *screen, true); if (intelBuffer->region == NULL) { - FREE(intelBuffer); + free(intelBuffer); return NULL; } diff --git a/src/mesa/drivers/dri/nouveau/nouveau_bufferobj.c b/src/mesa/drivers/dri/nouveau/nouveau_bufferobj.c index 1d7db52..717c0b8 100644 --- a/src/mesa/drivers/dri/nouveau/nouveau_bufferobj.c +++ b/src/mesa/drivers/dri/nouveau/nouveau_bufferobj.c @@ -67,8 +67,8 @@ nouveau_bufferobj_del(struct gl_context *ctx, struct gl_buffer_object *obj) struct nouveau_bufferobj *nbo = to_nouveau_bufferobj(obj); nouveau_bo_ref(NULL, &nbo->bo); - FREE(nbo->sys); - FREE(nbo); + free(nbo->sys); + free(nbo); } static GLboolean @@ -84,7 +84,7 @@ nouveau_bufferobj_data(struct gl_context *ctx, GLenum target, GLsizeiptrARB size /* Free previous storage */ nouveau_bo_ref(NULL, &nbo->bo); - FREE(nbo->sys); + free(nbo->sys); if (target == GL_ELEMENT_ARRAY_BUFFER_ARB || (size < 512 && usage == GL_DYNAMIC_DRAW_ARB) || diff --git a/src/mesa/drivers/dri/nouveau/nouveau_screen.c b/src/mesa/drivers/dri/nouveau/nouveau_screen.c index 3f65c36..4f78a82 100644 --- a/src/mesa/drivers/dri/nouveau/nouveau_screen.c +++ b/src/mesa/drivers/dri/nouveau/nouveau_screen.c @@ -144,7 +144,7 @@ nouveau_destroy_screen(__DRIscreen *dri_screen) nouveau_device_del(&screen->device); - FREE(screen); + free(screen); dri_screen->driverPrivate = NULL; } diff --git a/src/mesa/drivers/dri/nouveau/nv04_context.c b/src/mesa/drivers/dri/nouveau/nv04_context.c index 9472bdd..829aa87 100644 --- a/src/mesa/drivers/dri/nouveau/nv04_context.c +++ b/src/mesa/drivers/dri/nouveau/nv04_context.c @@ -134,7 +134,7 @@ nv04_context_destroy(struct gl_context *ctx) nouveau_object_del(&nctx->hw.surf3d); nouveau_context_deinit(ctx); - FREE(ctx); + free(ctx); } static struct gl_context * diff --git a/src/mesa/drivers/dri/nouveau/nv10_context.c b/src/mesa/drivers/dri/nouveau/nv10_context.c index a2448ca..97fc84d 100644 --- a/src/mesa/drivers/dri/nouveau/nv10_context.c +++ b/src/mesa/drivers/dri/nouveau/nv10_context.c @@ -423,7 +423,7 @@ nv10_context_destroy(struct gl_context *ctx) nouveau_object_del(&nctx->hw.eng3d); nouveau_context_deinit(ctx); - FREE(ctx); + free(ctx); } static struct gl_context * diff --git a/src/mesa/drivers/dri/nouveau/nv20_context.c b/src/mesa/drivers/dri/nouveau/nv20_context.c index 5a36c87..52013fd 100644 --- a/src/mesa/drivers/dri/nouveau/nv20_context.c +++ b/src/mesa/drivers/dri/nouveau/nv20_context.c @@ -434,7 +434,7 @@ nv20_context_destroy(struct gl_context *ctx) nouveau_object_del(&nctx->hw.eng3d); nouveau_context_deinit(ctx); - FREE(ctx); + free(ctx); } static struct gl_context * diff --git a/src/mesa/drivers/dri/r200/r200_context.c b/src/mesa/drivers/dri/r200/r200_context.c index 523a89d..f8add0f 100644 --- a/src/mesa/drivers/dri/r200/r200_context.c +++ b/src/mesa/drivers/dri/r200/r200_context.c @@ -281,7 +281,7 @@ GLboolean r200CreateContext( gl_api api, if (!radeonInitContext(&rmesa->radeon, &functions, glVisual, driContextPriv, sharedContextPrivate)) { - FREE(rmesa); + free(rmesa); *error = __DRI_CTX_ERROR_NO_MEMORY; return GL_FALSE; } diff --git a/src/mesa/drivers/dri/radeon/radeon_common_context.c b/src/mesa/drivers/dri/radeon/radeon_common_context.c index 8ea8925..6a56891 100644 --- a/src/mesa/drivers/dri/radeon/radeon_common_context.c +++ b/src/mesa/drivers/dri/radeon/radeon_common_context.c @@ -202,9 +202,9 @@ static void radeon_destroy_atom_list(radeonContextPtr radeon) struct radeon_state_atom *atom; foreach(atom, &radeon->hw.atomlist) { - FREE(atom->cmd); + free(atom->cmd); if (atom->lastcmd) - FREE(atom->lastcmd); + free(atom->lastcmd); } } @@ -267,7 +267,7 @@ void radeonDestroyContext(__DRIcontext *driContextPriv ) fclose(track); } #endif - FREE(radeon); + free(radeon); } /* Force the context `c' to be unbound from its buffer. diff --git a/src/mesa/drivers/dri/radeon/radeon_context.c b/src/mesa/drivers/dri/radeon/radeon_context.c index ebc0c69..2b99e36 100644 --- a/src/mesa/drivers/dri/radeon/radeon_context.c +++ b/src/mesa/drivers/dri/radeon/radeon_context.c @@ -243,7 +243,7 @@ r100CreateContext( gl_api api, if (!radeonInitContext(&rmesa->radeon, &functions, glVisual, driContextPriv, sharedContextPrivate)) { - FREE(rmesa); + free(rmesa); *error = __DRI_CTX_ERROR_NO_MEMORY; return GL_FALSE; } diff --git a/src/mesa/drivers/dri/radeon/radeon_dma.c b/src/mesa/drivers/dri/radeon/radeon_dma.c index 61cddda..2ffbc6d 100644 --- a/src/mesa/drivers/dri/radeon/radeon_dma.c +++ b/src/mesa/drivers/dri/radeon/radeon_dma.c @@ -302,19 +302,19 @@ void radeonFreeDmaRegions(radeonContextPtr rmesa) foreach_s(dma_bo, temp, &rmesa->dma.free) { remove_from_list(dma_bo); radeon_bo_unref(dma_bo->bo); - FREE(dma_bo); + free(dma_bo); } foreach_s(dma_bo, temp, &rmesa->dma.wait) { remove_from_list(dma_bo); radeon_bo_unref(dma_bo->bo); - FREE(dma_bo); + free(dma_bo); -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
