Tag 'pre-merge-glsl-compiler-1' created by Brian <br...@yutani.localnet.net> at 2007-03-26 15:35 +0000
checkpoint/tag master before merging in glsl-compiler-1 branch Changes since mesa_6_5_2: Aapo Tahkola (6): Fix invalid enums passed to MapBuffer Fix invalid enums passed to MapBuffer typo fix. this case still fails. support as much of GL_EXT_stencil_two_side as we can. untested. Fix #10071 - wrong max_index in vbo draw_prims. (Papadakos Panagiotis) Guess another unknown register in R300 command buffer initialization. (Oliver McFadden) Adam Jackson (1): Fix parallel make in r300 driver. Alan Hourihane (3): merge current trunk into vbo branch use passed target parameter Ensure we have a valid ReadBuffer for CopyTexSubImage, and Alan Swanson (3): radeon: Adapt cliprect fixes from r300. r200: Adapt cliprect fixes from r300. r200: Simplify r200SetCliprects like radeonSetCliprects in radeon and r300. Ben Skeggs (100): Add start of vertex shader backend, will most likely not work correctly yet Another TODO, so I don't forget.. A couple of quick fixes, the original had some half-finished Kill all the current shader code. fix typo Dont call exit() from the DRI driver, with AIGLX this is particularly nasty We need nmesa->driFd and friends setup before we call nouveauFifoInit Some more nouveau_screen.c setup, not sure how correct it is yet though.. Fix segfault in nouveauCalcViewport Add nv30InitStateFuncs jkolb pointed out that face can also be FRONT_AND_BACK. Added stencil funcs Adapt FIFO code to deal with cases where the base GET/PUT value isn't 0. Use RENDERINPUTS macros to access render_inputs_bitset poke the correct FIFO regs Stupid bug.. More FIFO fixes. Avoid sharing subchannels with the ddx until context switching is done Fix nv30LineWidth, hw expects a ubyte. Don't bother touching lighting stuff if shaders are in use nouveauCreateDmaObject Some missing state init fix scissor Incomplete shader stuff, should mostly work for NV40. Other cards, not so Fix progs/fp/tri-xpd Fix RSQ emulation - Add InitInstruction to hw shader backend, and remove SetUnusedSource. Fix a copy+paste'o that caused some *very* strange bugs.. Some work on buffer handling, most likely not entirely correct and oops, we don't want this by default just yet... Create visuals for modes the ddx provides oops, typo Implement a simple nv30Clear, and make sure we get a nouveau_renderbuffer state cache is automagically flushed on a normal BEGIN_RING_SIZE NV_44 uses nv30InitStateFuncs too Skeletal extension handling across chipsets. Some more voodoo to get 3D going with a minimal initial context. 0x4497 doesn't have NV30_TCL_PRIMITIVE_3D_NORMALIZE_ENABLE Improve SwapBuffers a bit. NV1x/2x hw_func stubs. Get nv10_swtcl.c working enough for glxgears on NV40. Don't build passthrough shader on <NV40 nouveau: get 16bpp working nouveau: Don't fill nrb->dPriv for private buffers nouveau: maintain numClipRects/pClipRects in context. nouveau: Modify span routines to use nouveau_renderbuffer instead of driRenderbuffer nouveau: Kill some compile warnings. nouveau: Add notifier support functions nouveau: Wait on notifier to check for completion of previous commands. nouveau: Make the notifier stuff actually work.. nouveau: Make use of NOUVEAU_DEBUG for shader disasm nouveau: Add simple wrapper for NV_MEMORY_TO_MEMORY_FORMAT. nouveau: Typo nouveau: record *actual* type of memory that was alloc'd, not the requested types. nouveau: add nouveau_mem_alloc/free debugging nouveau: We'll need syncNotifier for NV_MEMORY_TO_MEMORY_FORMAT too. nouveau: Initial buffer object support nouveau: Use bufferobj interface for fragment program uploads nouveau: bump drm patchlevel. nouveau: allow the use of multiple subchannels/objects by default. nouveau: fail CreateScreen on unknown cards instead of guessing. nouveau: Add 0x0244 pciid manually for now.. nouveau: bump drm patchlevel nouveau: shader backend branching support for all cards that support it. nouveau: kill off shader pass1. nouveau: rename pass0_arb to pass0. nouveau: start converting shaders into a tree format again.. nouveau: reindent shader pass0/pass2 nouveau: unbreak nv40 nouveau: fill in condition info for instructions nouveau: allow for card-specific shader infos to be kept nouveau: DPH and CMP for NV40 which doesn't do it natively. nouveau: some extra debug output nouveau: and here's the "oops, I suck" commit :) nouveau: add result scaling to shader backend, use it in RSQ emul for NV40. nouveau: unbreak NOUVEAU_RING_DEBUG nouveau: extend notifier interface to allow multiple notifiers in a memory block. nouveau: initial GL_ARB_occlusion_query support nouveau: fix nv30 line width nouveau: unhardcode some more NV30TCL_FP_CONTROL values nouveau: maintain a map of which vtxprog input corresponds to which array nouveau: oops nouveau: remove an unused table nouveau: oops, build attrib map after we know how the final shader will look.. nouveau: rework shader param handling nouveau: NV40 glClipPlane support. nouveau: misc NV40 fixes nouveau: argh nouveau: new bufferobj code. nouveau: fix a small bug in nv10 swtcl nouveau: OUT_RINGp expects the size in dwords, not bytes. nouveau: a couple of NV3x fixes nouveau: drm interface changes nouveau: avoid using uninitialised TexSrcUnit. nouveau: NVSDBG macro nouveau: fail translate if we use too many params somehow nouveau: fix typo nouveau: SwapBuffers() needs to perform a glFlush() nouveau: update for drm interface changes (0.0.5) nouveau: some swtcl fixes nouveau: match drm version bump Brian (100): New info about Mesa's git repository. New git repository info, links. Removed/obsolete. Replaced by .html files. Replaced by .html file. Updated with new mesa-commit list. Merge branch 'master' of git+ssh://bri...@git.freedesktop.org/git/mesa/mesa Use XDisplayName() when reporting errors (bug 8079). Remove the xdemo.c program from PROGS since it doesn't work with GLX/DRI. Move all the code for computing ctx->_TriangleCaps into state.c. Check in a long-misplaced spec update. Replace __extension__ with LONGSTRING. Merge branch 'master' of git+ssh://bri...@git.freedesktop.org/git/mesa/mesa don't allow fog when using a fragment shader (bug 9346) initial release notes for 6.5.3 Don't update span->array->z[] values from SLANG_FRAGMENT_FIXED_FRAGDEPTH. s/unsigned/size_t/ (Matthias Hopf) Fix glPush/PopClientAttrib() for VBO state (bug 9445). document VBO bug fix 9445 Merge branch 'master' of git+ssh://bri...@git.freedesktop.org/git/mesa/mesa Use GLuint instead of GLint to store intermediate Z values. Fixes problems when using 32-bit Z buffer. document 32-bit Z line/point fix Merge branch 'master' of git+ssh://bri...@git.freedesktop.org/git/mesa/mesa fixes for C++ warnings/errors silence C++ warnings Merge branch 'master' of git+ssh://bri...@git.freedesktop.org/git/mesa/mesa document, re-indent _mesa_ffsll() fix typo Merge branch 'master' of git+ssh://bri...@git.freedesktop.org/git/mesa/mesa note that non-member posts are auto-rejected s/params/pointer/ for glGetVertexAttribPointer s/params/pointer/ for glGetVertexAttribPointer s/params/pointer/ for glGetVertexAttribPointer bump version to 6.5.3 s/params/pointer/ for glGetVertexAttribPointer regenerated fix mem leak in __glXReportDamage (Panagiotis Papadakos) Merge branch 'master' of git+ssh://bri...@git.freedesktop.org/git/mesa/mesa Add _NEW_PROGRAM flag to _MESA_NEW_NEED_EYE_COORDS. Merge branch 'master' of git+ssh://bri...@git.freedesktop.org/git/mesa/mesa updated to version 39 glext.h version 39 updated to version 18 glxext.h version 18 more branch info Merge branch 'master' of git+ssh://bri...@git.freedesktop.org/git/mesa/mesa make src ptr const clean-up, comment code Fix broken cubemap mipmap layout (the cubemap.c demo was segfaulting). Merge branch 'master' of git+ssh://bri...@git.freedesktop.org/git/mesa/mesa Merge branch 'master' of git+ssh://bri...@git.freedesktop.org/git/mesa/mesa Merge branch 'master' of git+ssh://bri...@git.freedesktop.org/git/mesa/mesa updated version with new Khronos license/copyright Do proper framebuffer refcounting in _mesa_make_current(). if renderbuffer ptr is null, just return Rewrite code related to buffer destruction. fix mem leak assert that fb->RefCount==0 in _mesa_free_framebuffer_data() fix comment s/ARB/MESA/ in extension check (bug 10126) Merge branch 'master' of git+ssh://bri...@git.freedesktop.org/git/mesa/mesa include assert.h s/unsigned int/size_t/ (bug 10135) fix clipping, display name, warnings fix bad n_dot_h normalization code (bug 9977), plus clean-up the code in general move oldFb decl into tighter scopes Merge branch 'master' of git+ssh://bri...@git.freedesktop.org/git/mesa/mesa Take care of texObj reference in _mesa_free_framebuffer_data() Fix/improve framebuffer object reference counting. formatting fix fix renderbuffer mem leak unreference old framebuffer, if needed, in _mesa_reference_framebuffer() explicit calls to _mesa_unreference_framebuffer() not always needed now Merge branch 'master' of git+ssh://bri...@git.freedesktop.org/git/mesa/mesa destroy window during cleanup New IMAGE_RED_TO_LUMINANCE flag passed to _mesa_pack_rgba_span_float() to fix glGetTexImage(GL_LUMINANCE) bug #10232. check for EXT_blend_equation_separate for 2.0 Fix TEXREL issues. take GL_UNPACK_ALIGNMENT into account in _mesa_image_row_stride() for GL_BITMAP type (bug 10261) clean-up, simplify _mesa_image_row_stride() move CLIENT_ID code in xmesa_delete_framebuffer(), see bug 7205 Merge branch 'master' of git+ssh://bri...@git.freedesktop.org/git/mesa/mesa clear the b->frontxrb->drawable field in xmesa_free_buffer(), see bug 7205 Re-org of gl_pixel_attrib struct. pixelmap code simplification implement byteswapping for all multi-byte types in _mesa_pack_rgba_span_float(), bug 10298 Merge branch 'master' of git+ssh://bri...@git.freedesktop.org/git/mesa/mesa add some rb->Data null ptr checks (bug 7205) no-op clear if buffer width or height is zero (bug 7205) added SWIZZLE_XXXX, YYYY, etc. macros added a renderbuffer comment Colortable re-org. Assorted fixes for dealing with zero-size frame/renderbuffers. 1D convolution (and post-conv scale/bias) were inadvertantly applied to 2D image transfers. document 1D convolution fix use _mesa_copy_instructions() use _mesa_alloc_instructions() Implement alpha buffer copy for SwapBuffers(). destroy window on exit Fix some renderbuffer reference counting issues. Also fixes a mem leak. Brian Paul (2): md5 sums version bump Carlos Martín Nieto (1): nouveau: Implement much of the fog handling. Christian Neumair (1): set log level w/ env var Christoph Bill (3): Add early register descritpion. r300: Use reg definition when available & add missing reg definition. r300: Use register name & add a register about shading. Claudio Ciccani (1): Updated copyright header. Daniel Nylander (1): Swedish translation of driconf options. Dave Airlie (5): Merge branch 'nouveau-import' fix issue with i915tex advertising visuals it can't support r300: get rid of CB_DPATH legacy r300: change vendor string to DRI R300 Project nouveau: implement nv20Clear and nv20Scissor Eric Anholt (8): i965: Fix a crash with wine by not allocating >1MB on the stack. Add reporting of damage by DRI drivers when the extension support is available. i965: Connect INTEL_DEBUG=sync up to cmd/batch ioctls. i965: Avoid branch instructions while in single program flow mode. Track rename of DamagePost -> DamageAdd. Remove dead code causing a warning. Add _mesa_ffsll() for compatibility on OSes without ffsll(), and use it. Bug #9604: Fix a static buffer allocation failure. Etienne Clement (1): test for POT before using sample_2d_linear_repeat() Gary Wong (1): Fix copy-and-paste mistake in comment ("scaling" should read "translation"). George Sapountzis (7): Bug 7790: Polygons incorrectly clipped by mach64 driver Bug 7861: mach64 with render acceleration should restore texture state Bug 7260: mach64 texture memory mng cleanup Drop mesa wrappers for XFree86. Drop old (pre-AIGLX) GLcore interface. Override Const.CheckArrayBounds for Xserver in XMesaCreateContext(). Bug 9628: no entry for GetVertexAttribPointerv Haihao Xiang (3): Use the tiled flag in the sarea to determine region tiling. i965: Support linear format in i965. fix some format conversion bugs in glGetTexImage(), bug 10288 Ian Romanick (9): Add missing files to server generation list. Hack indent flags for indirect_reqsize.h to eliminate extra diffs. Use glxbyteorder.h in server-side source files. Merge branch 'master' of ssh+git://i...@git.freedesktop.org/git/mesa/mesa Delete two invalid assertions. Merge branch 'master' of ssh+git://i...@git.freedesktop.org/git/mesa/mesa Fix GLAPIENTRYP for OS X. Fix cut-and-paste error in the name of GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB. Merge branch 'master' of ssh+git://i...@git.freedesktop.org/git/mesa/mesa J.Jansen (1): Updates of the OpenVMS makefiles. Jakob Bornecrantz (1): Add support for CN700 chipset in miniglx Jeremy Kolb (16): Some compile fixes. Added the beginnings of state (not much there yet). Fixed some includes. Cleaning Add more feilds to context. State changes. Changed invalid context fields to valid ones. More context. Fix compile errors. Add vblank_seq to nouveau_context. Oops. Forgot to check in the context change. Added OUT_RING* debugging macros. Compile with NOUVEAU_RING_DEBUG to use. Fill in nv30PointSize and nv30Viewport. Add include guard. Add state initialization to context creation. More state. nouveau: Fixes for nv30. Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/mesa Jerome Glisse (10): Move r300 to new fbo interface based on Keith Whithwell. Rework r300 fragprog avoid using bitfield structure. Deleted unused file which likely have be reintroduced during git move. r300: Correct bug introduced by fragprog rework. Fix typo from commit 1d312ae0137eb39bf74fac91eb97ed25c289a4ca . mesa: Update _Current ptr along Current when a new vertex program is bind. r300: Fix vertex program position invariant bug, force position reading. mesa: Update _Current along Current on fragment program bound. Update doxygen doc to reflet vbo changes. doxygen: update doxygen project number to 6.5 Keith Packard (3): Initialize GL_ARB_occlusion_query only if DRM support is present. Various warning fixes for i965 driver. Merge branch 'origin' Keith Whitwell (51): Checkpoint of new vbo-building code. Currently builds regular arrays Changes for new vbo-building module. remove this module switch over to vbo module Fix compiler warning checkpoint - remove dead files, otherwise untested better handling of current attributes. Trivial dlist and varray tests work switch several dri drivers over Remove wakeup functions. This code is intended to be active all the Move edgeflag into the VERT_ATTRIB_SEVEN slot. This means that our oops, get.c is autogenerated cleanup code, compiles with vbo changes move public structure definitions to vbo.h pickup structs from vbo.h remove vtxfmt code, switch over to vbo disable vtxfmt_a code, switch over to vbo switch remaining drivers over to vbo missing file Respect array->Normalized flag. Fix typo in display list attrib binding. Fill in missing input slots in the vertex-array + no-vertex-program Similarly, fill in missing input slots in the vertex-array + Fix typo in last commit Fix type-conversion of incoming vertices. Fix compiler warnings. Don't perform dangling attribute check on POS attribute. It can't by Remove special-case handling for index and edgeflag Split too-large draw commands. Correctly initialize current attribute sizes. Don't special-case FOG attribute initialization. Remove unused index buffer. Merge branch 'master-merge' into vbo-0.2 Merge branch 'vbo_0_1_branch' into vbo-0.2 Merge branch 'master' of git+ssh://kei...@git.freedesktop.org/git/mesa/mesa into vbo-0.2 Merge vbo_0_1_branch Additional display list tests Don't special-case index, edgeflag. New debug config for linux-dri New tests for the array functions which also provoke rebasing. Helper for rebasing draw requests where min_index != 0. Use new rebase helper. Remove other rebase code. Cope with internally-generated null inputs. Correct usage/meaning of max_index parameter. Modify assert to reflect rebase criteria Merge branch 'vbo-0.2-origin' into vbo-0.2 Merge branch 'vbo-0.2' Propogate UsesKill information. Fix off by one error in immediate state packet size. fix typo in subrect_disable packet fix typo in subrect_disable packet fix off-by-one in load_state_immediate Mathias Hopf (1): added null xmctx check to XMesaResizeBuffers(), bug 7205 Matthieu Castet (3): nouveau : nv10 mixing cached stuff with not cached stuff is bad. nouveau : nv10 comment icomplete command nouveau : NOUVEAU_RING_TRACE Michel Dänzer (50): Re-generate options.h with Swedish translations. Make git ignore files only generated at build time. glxinfo: When direct rendering is not enabled, print some hints. Make git ignore some more generated files. Make git ignore Emacs backup files. i915tex: Recalculate viewport related hardware state in intelWindowMoved(). minstall: Always remove destination file before (re-)creating it. minstall: Pass correct destination file path to $RM regardless of source path. mipmap_limits: Fix display of current texture filtering mode. _mesa_swizzle_ubyte_image: Only use single swizzle_copy call when strides match. intelTexSubimage: Fix last parameter for intel_miptree_image_map(). intel_batchbuffer_flush: Don't assert cliprects when lock is not held. intel_finalize_mipmap_tree: Add more conditions for rebuilding mipmap trees. Share code to lay out >= 945 style 2D mipmaps between i915tex and i965 drivers. Fix some corner cases in i945_miptree_layout_2d(). Avoid failing assertion in intel_miptree_set_image_offset() with cube maps. Fix copy-and-paste-o of my e-mail address. intel_finalize_mipmap_tree: Only flush batchbuffer when necessary. i915tex: Remove unused tex_program field. driDestroyDisplay: Remove Drivers list entry when dlclosing its handle. driDestroyDisplay: Fix comment, it is called now. r300CreateContext: Really initialize r300->initialMaxAnisotropy. Remove unused r200 files from r300 driver directory. Fall back to software rasterization if r300_translate_fragment_shader() fails. Merge branch 'origin' i915tex: Make page flipping work again. i915tex: Support page flipping on both CRTCs independently. intelCopyBuffer: Remove incorrect intel_fb->pf_current_page tests. intelRotateWindow: Only use back buffer and cliprects in very specific cases. intelWindowMoved: Some debugging output was accidentally left always enabled. i915tex: Triple buffering support, only effective with page flipping so far. i915tex: Schedule flips when possible. i915tex: Also update intel_rb->vbl_pending when scheduled swap is not a flip. i915tex: Check that intel_rb is valid before trying to add it to an fbo. i915tex: Sync pages differently when crossing pipe borders. r300: Call radeonSetCliprects from radeonMakeCurrent. i945_miptree_layout: Adapt cubemap fixes from i915_miptree_layout. i915tex: Set framebuffer size to match window before calling _mesa_make_current. r300: Also update window state when it's already bound but its stamp changed. i915tex: Do not wait for pending flips on both pipes at the same time. i915tex: Sync pages between pipes immediately again. i915tex: Set intel_fb->vbl_waited to current instead of what we aimed for. i915tex: Wait for pending scheduled flips before switching vsync pipe. Merge branch 'i915tex-pageflip' i915tex: Fix build against released version of libdrm. i915tex: Fix intel_wait_flips being declared implicitly. i915tex: Fix build against libdrm git... i915tex: Don't crash when intel_fb->color_rb[i] is NULL. i915tex: Fix triple buffering after recent Mesa core changes. i915tex: The intended triple buffering fix. Miguel Marte (1): screen offset changes, bug 9965 Nicolai Haehnle (22): fix assertion in read_depth_pixels() r300: Fix fragment program instruction pairing and register allocation r300: Fix hw fragment program dump r300: Fragment program dumps format tex instructions r300: Fix fragment program reordering r300: Streamlined fragment program LIT implementation r300: Fix WRITEMASK handling when writing to result.depth r300: Whitespace cleanup (remove trailing spaces) r300: Dump fragment program after translation if RADEON_DEBUG=pixel is set r300: Clear fragment program instruction slots on first use r300: Fix special case (tmp.x <= 0) in fragment program LIT instruction r300: Cleanup fragment program constant allocation, share constants r300: Whitespace cleanup (remove trailing spaces) r300: Remove the program-global const_sin index r300: Whitespace cleanup (remove trailing spaces) swrast: Fix crash when sampling from a non-existing texture object r300: Fix: KIL instruction don't require textures r300: No assertion when accessing incomplete texture images. r300: Fix texture coordinate calculation for rectangle textures r300: Fix regression: unnecessary node indirection r300: Whitespace cleanup in r300_texstate.c r300: Whitespace cleanup in r300_texmem.c Oliver McFadden (18): Renamed some of the unkXXX variables in the command buffer init Guess another unknown register used for R300 pacification. Corrected values written to R300_RB3D_DSTCACHE_CTLSTAT to either Documented the value written for R300_TX_CNTL cache flush. Add defines for the values written to R300_RB3D_ZCACHE_CTLSTAT. r300: Renamed the CACHE_CTLSTAT values to include UNKNOWN in the name; not Committed Rune Petersen's fragment.position patch (Bug #10024) plus a few small r300: Fixed "no previous prototype for 'r300RefillCurrentDmaRegion'" warning. r300: Fixed a printf conversion warning. r300: Fixed an unused variable warning and removed some cruft, too. r300: Updated R300 to use the new SWIZZLE macros. r300: Use _mesa_alloc_instructions/_mesa_init_instructions instead of malloc. r300: Renamed r300_vertexprog.c to r300_vertprog.c r300: Added _mesa_copy_instructions. Fixed a minor typo in the comment near _mesa_copy_instructions. Use _mesa_copy_instructions rather than memcpy in _mesa_insert_mvp_code. r300: Corrected the string for polygon mode; it wasn't updated from unkXXX. r300: Removed the deprecated $XFree86$ CVS keywords. Panagiotis Papadakos (5): break if we removed driver from Drivers list in driDestroyDisplay fix mem leaks fix mem leak add missing param to _mesa_warning() s/pdp/prp/ in DoBindContext() Patrice Mandin (52): Remove useless reference to fifo_num field basic primitives vert_copy_rgba macro vert_copy_spec macro render_primitive macro reimport sw stuff more macros, still missing the alloc_verts one nv10: vertex attribute output format oops, time to go to bed nv10 state copy/pasted from nv30 state nv10: update state update from renouveau ah, correct revision now nv10,nv20,nv30: color light components renamed from a,b,c to r,g,b nv10,nv20: nvX0ShadeModel static function Enable nv10 tcl state nv10: rename spot light coefs like nv20,nv30 nv10,nv20,nv30: send correct values for spot light direction X,Y,Z and Remove duplicate nv10 tcl defines Resend spot light parameters when part of it changes grr, always check twice before commit Update spot light params also for nv20 and nv30 Update spot light params nv10 has alpha color mask nouveau: Add clear color for nv10 nouveau: update nv10 state nouveau: nv10 blending done, remove nv10Viewport nouveau: nv10: currently fails initcard and bindbuffers, till done nouveau: nv10: stencil functions nouveau: import color material r,g,b,a nouveau: remove already defined NV15_TCL and NV17_TCL nouveau: nv10: added missing functions Merge branch 'master' of git+ssh://pman...@git.freedesktop.org/git/mesa/mesa nouveau: nv10: 16 bits color buffer format nouveau:nv10: fix setting clip region nouveau: preliminary nv50 state nouveau: use color pitch as depth pitch if depth disabled nouveau: fix viewport clipping initialization nouveau: nv50: use nv50 state nouveau: forgot function declaration nouveau: nv10: add init for unknown 0x120 nouveau: nv10: there are 8 clipping regions nouveau: nv10: fix viewport scale and origin nouveau: nv10: rescale depth near and far nouveau: nv10: set clear value for 16 and 24 bits depth nouveau: nv20: update nouveau: nv20: texture matrix nouveau: nv10,20: wrong viewport clip setup nouveau: nv50: update nouveau: nv10: keep 24/8 depth/stencil value, don't check for depth bits nouveau: nv10: also check ctx->DrawBuffer in nv10ViewportScale nouveau: nv10: grr, ctx->DrawBuffer invalid? Roland Scheidegger (26): remove remaining traces of r200FlushVertices... need to call bind_arrays() in vbo_exec_DrawRangeElements. submit vertex weights to make World of Warcraft maybe happy (bug 8250) put back missing Driver.PolygonMode call (bug 9578) re-fix bug 9062 in vbo code remove tnl/t_vtx_x86_gcc.S file from sources as it no longer exists fix dstelt memory allocation to avoid hash corruption allocate larger minimum dstelt buffer do not rebase index buffers as it does not work currently (tested with r200 and sw mesa) fix unitialized values in radeonClear fix missing ADD_POINTERS, fixes crashes if the index elements are in a vbo. fix errorneously adding fog state params to all vertex programs... remove now unused vtxfmt stuff from radeon/r200 header files disable r200 materials-between-begin-end check if vertex progs are enabled fix issues when using mixed-mode pos-invariant vp and ff tnl (bug #9856) fix issues in vp when using FRAG_BIT_WPOS in a fragment program (bug #9910) optimize generated vertex programs a bit r200: simplify / unify input map handling for vp and fftnl optimize per-pixel fog program fix stupid bug in the optimized per-vertex fog generation code fix typo preventing generic arrays from working with ARB_vp (bug #9952) r200 fix broken (by new input handling) fogcoord use movdqu instead of movdqa for unaligned load avoiding a segfault (bug 10265) enable ARB_vertex_buffer_object for more dri drivers sync up t_vp_build.c brw_vs_tnl.c a bit fix copy and paste bug from last commit in fog generation code for GL_LINEAR fog Rune Petersen (1): Optimize cos&sin instruction a bit more. Rune Peterson (3): ctx->Point._Size fix r300: Add proper support for sin/cos instruction in fragment program r300: Fix cos & add scs to fragment program. Sean D'Epagnier (3): Updated keyboard input so that glut programs can read from stdin without Commiting a few minor fixes to glut fbdev (segfault on a separate stack) Merge branch 'master' of git+ssh://geckosena...@git.freedesktop.org/git/mesa/mesa Stephane Marchesin (58): Initial revision Import Some small improvements. rename nv40_tris to nv30_tris. Rename nouveau_3d_reg.h to nouveau_reg.h More work on the nv30 software tcl code Added some NV20 support - nv_30_tris.c should probably be renamed again. Cleaned up the software TCL code a bit. Renamed nv30_tris.[c,h] to Added a missing field A little work here and there Cleaned up some code, made more files compile. Renamed nv20_swtcl.* to Cleaned stuff in the tcl code Added vertex attributes to the context Silence the lock warning Added render index field to the context ooops More work on the tcl code... still have to make my mind on a number of Some work towards making the nv10 swtcl compile Make nouveau actually compile Small changes Rename nouveau_tris.* to nouveau_swtcl.* Some small changes Architect the DRI : Commit a small nitpick Some work on nv30 state, heavily based on jkolb's work Add the GL_LIGHING enable Fix the texture init function name Some nouveau_screen work for darktama Small unneeded nv03 fix Add nv20_state.c ; hook nv10_state.c into the build ; do the renaming More state functions New swtcl implementation. It's simpler than the previous one (doesn't use Fix the fifo debugging feature. Oops. More fifo debug fixes More work on the swtcl Use NONINC_METHOD for vertex data. Cleanup the swtcl code. Add the state caching mechanism. It seems to work, from what I can see. Remaining state cache changes That was really stupid. Merge the pciid work. Use lock step versioning with the drm. Fix the swtcl module. nouveau: Cleanup the nv10 swtcl module. nouveau: add the nv04 swtcl module (it's untested for now). nouveau: Make the state cache hierarchical. nouveau: Update nouveau_reg.h from renouveau to the latest version. nouveau: Fix a bug in the nv04 swtcl. nouveau: Use the most recent card list. nouveau: add nv04 state support, and small nv04 fixes. nouveau: fix some bugs in the nv10 swtcl. nouveau: more work on nv04, this time buffer format/pitches/... nouveau: fix nv04 and nv10 swtcl, more work on nv04 state. nouveau: add a fifo size debug check. nouveau: some fixes to the nv04 state code. nouveau: oops don't debug by default. nouveau: fix the nv04 swtcl code. nouveau: fix nv04 swtcl. Thomas Hellstrom (4): i915tex: Fix randr resizing. Rotation still broken. i915tex: Relocation fixes: i915tex: Take into account various mapping states when dropping the i915tex: Fix performance regression with new vbo code and latest drm. Wang Zhenyu (1): i965: ARB_occlusion_query support Xiang, Haihao (19): fix bug#9045 fix bug#9237 Fix bug#9673 I965: fix bug#9625-get the correct PV for quardstrip _mesa_pack_rgba_span_float: fix for packing data into group I965: fix a failure on waiting irq. fix for bug#9971 fix for bug#10182 remove a if-statement fix for bug#10196 mesa: _mesa_unpack_image i965: fix for FXT1 & S3TC texture format mesa: enhance fxt1_quantize_ALPHA1 mesa: SWAP_BUFF support when calling DrawPixels(DEPTH_COMPONENT) fix for bug#10347 mesa: revert f9f79c8d770e696249bd98c68b563f887562c974 fix for bug#10339 Color3iv: set the alpha value to 1.0 i965: The given urb layout(maximal size of urb entries and the Zou Nan hai (10): i965: Take clip rects into account when computing max prim i965: xdemos/glxthreads get: Assertion `block->fenced' failed (9201) 965 ARB_Occlusion_query fix 965 glxswapcontrol fix ARB_Occlusion_query should support multiple query at same time Merge branch 'master' of git+ssh://z...@git.freedesktop.org/git/mesa/mesa Fix fd.o #9686, when fall into vertex fog, push commit 2dfb3a217f730d6783fb2ac8b73248dc682f923c to i915tex array overflow fix fd.o #BZ 9684 keithw (4): New files to manage splitting drawing commands Add vbo_split files Hook in split functionality Remove debug, reenable inplace splitting. --- .gitignore | 8 bin/minstall | 1 configs/.gitignore | 1 configs/freebsd-dri | 3 configs/linux-dri | 3 configs/linux-dri-debug | 16 docs/RELNOTES-6.4.1 | 47 docs/RELNOTES-6.4.2 | 47 docs/RELNOTES-6.5 | 97 docs/RELNOTES-6.5.1 | 60 docs/contents.html | 3 docs/cvs_access.html | 106 docs/cvs_branches.html | 80 docs/download.html | 2 docs/lists.html | 67 docs/news.html | 7 docs/relnotes-6.5.2.html | 10 docs/relnotes-6.5.3.html | 82 docs/relnotes.html | 1 docs/repository.html | 111 doxygen/.cvsignore | 15 doxygen/.gitignore | 15 doxygen/Makefile | 2 doxygen/array_cache.doxy | 50 doxygen/common.doxy | 2 doxygen/doxy.bat | 4 doxygen/glapi.doxy | 2 doxygen/header.html | 2 doxygen/main.doxy | 2 doxygen/math.doxy | 2 doxygen/shader.doxy | 2 doxygen/swrast.doxy | 2 doxygen/swrast_setup.doxy | 2 doxygen/tnl.doxy | 2 doxygen/tnl_dd.doxy | 2 doxygen/vbo.doxy | 50 include/GL/glext.h | 627 +++ include/GL/glxext.h | 113 include/GL/internal/dri_interface.h | 20 include/GL/internal/glcore.h | 257 - progs/demos/.cvsignore | 48 progs/demos/.gitignore | 48 progs/demos/texdown.c | 8 progs/demos/winpos.c | 2 progs/redbook/.cvsignore | 64 progs/redbook/.gitignore | 64 progs/samples/.cvsignore | 45 progs/samples/.gitignore | 45 progs/tests/.cvsignore | 54 progs/tests/.gitignore | 54 progs/tests/fbotest1.c | 4 progs/tests/fbotest2.c | 4 progs/tests/fbotexture.c | 5 progs/tests/mipmap_limits.c | 2 progs/tests/sharedtex.c | 22 progs/tools/trace/gltrace_support.cc | 3 progs/trivial/Makefile | 10 progs/trivial/dlist-dangling.c | 149 progs/trivial/dlist-edgeflag-dangling.c | 152 progs/trivial/dlist-edgeflag.c | 156 progs/trivial/drawarrays.c | 127 progs/trivial/drawelements.c | 120 progs/trivial/drawrange.c | 118 progs/trivial/vbo-drawarrays.c | 133 progs/trivial/vbo-drawelements.c | 137 progs/trivial/vbo-drawrange.c | 145 progs/xdemos/.cvsignore | 16 progs/xdemos/.gitignore | 16 progs/xdemos/Makefile | 2 progs/xdemos/glthreads.c | 2 progs/xdemos/glxcontexts.c | 4 progs/xdemos/glxgears_fbconfig.c | 2 progs/xdemos/glxheads.c | 2 progs/xdemos/glxinfo.c | 16 progs/xdemos/glxswapcontrol.c | 2 progs/xdemos/manywin.c | 2 progs/xdemos/opencloseopen.c | 2 progs/xdemos/pbinfo.c | 2 progs/xdemos/yuvrect_client.c | 2 src/egl/docs/EGL_MESA_screen_surface | 28 src/egl/main/egllog.c | 41 src/glut/fbdev/fbdev.c | 17 src/glut/fbdev/glut_fbdev.c | 2199 ------------- src/glut/fbdev/input.c | 86 src/glx/x11/.gitignore | 1 src/glx/x11/dri_glx.c | 24 src/glx/x11/glxcmds.c | 3 src/glx/x11/glxext.c | 71 src/glx/x11/indirect.c | 50 src/glx/x11/indirect.h | 2 src/glx/x11/indirect_vertex_array.c | 6 src/mesa/.gitignore | 2 src/mesa/Makefile | 2 src/mesa/array_cache/ac_context.c | 375 -- src/mesa/array_cache/ac_context.h | 99 src/mesa/array_cache/ac_import.c | 922 ----- src/mesa/array_cache/acache.h | 132 src/mesa/array_cache/descrip.mms | 37 src/mesa/array_cache/sources | 7 src/mesa/drivers/allegro/amesa.c | 2 src/mesa/drivers/beos/GLView.cpp | 6 src/mesa/drivers/directfb/idirectfbgl_mesa.c | 31 src/mesa/drivers/dri/common/dri_bufmgr.c | 2 src/mesa/drivers/dri/common/dri_util.c | 25 src/mesa/drivers/dri/common/extension_helper.h | 22 src/mesa/drivers/dri/common/xmlpool/.gitignore | 5 src/mesa/drivers/dri/common/xmlpool/Makefile | 2 src/mesa/drivers/dri/common/xmlpool/options.h | 69 src/mesa/drivers/dri/common/xmlpool/sv.po | 226 + src/mesa/drivers/dri/fb/fb_dri.c | 14 src/mesa/drivers/dri/fb/fb_egl.c | 6 src/mesa/drivers/dri/ffb/ffb_state.c | 4 src/mesa/drivers/dri/ffb/ffb_xmesa.c | 8 src/mesa/drivers/dri/gamma/gamma_context.c | 4 src/mesa/drivers/dri/gamma/gamma_state.c | 4 src/mesa/drivers/dri/gamma/gamma_xmesa.c | 6 src/mesa/drivers/dri/i810/i810context.c | 8 src/mesa/drivers/dri/i810/i810screen.c | 2 src/mesa/drivers/dri/i810/i810state.c | 4 src/mesa/drivers/dri/i915/i915_context.c | 5 src/mesa/drivers/dri/i915/i915_reg.h | 2 src/mesa/drivers/dri/i915/i915_state.c | 12 src/mesa/drivers/dri/i915/i915_vtbl.c | 2 src/mesa/drivers/dri/i915/intel_context.c | 8 src/mesa/drivers/dri/i915/intel_screen.c | 2 src/mesa/drivers/dri/i915tex/Makefile | 6 src/mesa/drivers/dri/i915tex/i915_context.c | 3 src/mesa/drivers/dri/i915tex/i915_context.h | 1 src/mesa/drivers/dri/i915tex/i915_reg.h | 2 src/mesa/drivers/dri/i915tex/i915_state.c | 13 src/mesa/drivers/dri/i915tex/i915_tex.c | 35 src/mesa/drivers/dri/i915tex/i915_tex_layout.c | 79 src/mesa/drivers/dri/i915tex/intel_batchbuffer.c | 18 src/mesa/drivers/dri/i915tex/intel_batchbuffer.h | 2 src/mesa/drivers/dri/i915tex/intel_blit.c | 257 - src/mesa/drivers/dri/i915tex/intel_buffer_objects.c | 5 src/mesa/drivers/dri/i915tex/intel_buffers.c | 382 +- src/mesa/drivers/dri/i915tex/intel_buffers.h | 3 src/mesa/drivers/dri/i915tex/intel_context.c | 118 src/mesa/drivers/dri/i915tex/intel_context.h | 17 src/mesa/drivers/dri/i915tex/intel_fbo.c | 46 src/mesa/drivers/dri/i915tex/intel_fbo.h | 35 src/mesa/drivers/dri/i915tex/intel_mipmap_tree.c | 9 src/mesa/drivers/dri/i915tex/intel_reg.h | 4 src/mesa/drivers/dri/i915tex/intel_regions.c | 5 src/mesa/drivers/dri/i915tex/intel_regions.h | 2 src/mesa/drivers/dri/i915tex/intel_screen.c | 118 src/mesa/drivers/dri/i915tex/intel_screen.h | 2 src/mesa/drivers/dri/i915tex/intel_tex_layout.c | 1 src/mesa/drivers/dri/i915tex/intel_tex_subimage.c | 3 src/mesa/drivers/dri/i915tex/intel_tex_validate.c | 19 src/mesa/drivers/dri/i915tex/intel_tris.c | 3 src/mesa/drivers/dri/i915tex/server/i830_common.h | 6 src/mesa/drivers/dri/i965/Makefile | 14 src/mesa/drivers/dri/i965/brw_attrib.h | 114 src/mesa/drivers/dri/i965/brw_attrib_tmp.h | 485 -- src/mesa/drivers/dri/i965/brw_clip.c | 2 src/mesa/drivers/dri/i965/brw_clip.h | 2 src/mesa/drivers/dri/i965/brw_context.c | 8 src/mesa/drivers/dri/i965/brw_context.h | 28 src/mesa/drivers/dri/i965/brw_draw.c | 174 - src/mesa/drivers/dri/i965/brw_draw.h | 57 src/mesa/drivers/dri/i965/brw_draw_current.c | 103 src/mesa/drivers/dri/i965/brw_draw_upload.c | 130 src/mesa/drivers/dri/i965/brw_eu.h | 1 src/mesa/drivers/dri/i965/brw_eu_emit.c | 155 src/mesa/drivers/dri/i965/brw_exec.c | 125 src/mesa/drivers/dri/i965/brw_exec.h | 150 src/mesa/drivers/dri/i965/brw_exec_api.c | 716 ---- src/mesa/drivers/dri/i965/brw_exec_array.c | 283 - src/mesa/drivers/dri/i965/brw_exec_draw.c | 227 - src/mesa/drivers/dri/i965/brw_exec_eval.c | 255 - src/mesa/drivers/dri/i965/brw_fallback.c | 349 -- src/mesa/drivers/dri/i965/brw_fallback.h | 4 src/mesa/drivers/dri/i965/brw_gs.c | 9 src/mesa/drivers/dri/i965/brw_gs.h | 1 src/mesa/drivers/dri/i965/brw_gs_emit.c | 10 src/mesa/drivers/dri/i965/brw_metaops.c | 73 src/mesa/drivers/dri/i965/brw_misc_state.c | 8 src/mesa/drivers/dri/i965/brw_program.c | 4 src/mesa/drivers/dri/i965/brw_save.c | 126 src/mesa/drivers/dri/i965/brw_save.h | 171 - src/mesa/drivers/dri/i965/brw_save_api.c | 1170 ------- src/mesa/drivers/dri/i965/brw_save_draw.c | 221 - src/mesa/drivers/dri/i965/brw_structs.h | 22 src/mesa/drivers/dri/i965/brw_tex.c | 3 src/mesa/drivers/dri/i965/brw_tex_layout.c | 55 src/mesa/drivers/dri/i965/brw_urb.c | 2 src/mesa/drivers/dri/i965/brw_vs.c | 5 src/mesa/drivers/dri/i965/brw_vs_constval.c | 7 src/mesa/drivers/dri/i965/brw_vs_emit.c | 6 src/mesa/drivers/dri/i965/brw_vs_tnl.c | 85 src/mesa/drivers/dri/i965/brw_vtbl.c | 10 src/mesa/drivers/dri/i965/brw_wm.c | 49 src/mesa/drivers/dri/i965/brw_wm_fp.c | 2 src/mesa/drivers/dri/i965/brw_wm_state.c | 4 src/mesa/drivers/dri/i965/bufmgr.h | 2 src/mesa/drivers/dri/i965/bufmgr_fake.c | 18 src/mesa/drivers/dri/i965/intel_blit.c | 4 src/mesa/drivers/dri/i965/intel_context.c | 81 src/mesa/drivers/dri/i965/intel_context.h | 3 src/mesa/drivers/dri/i965/intel_ioctl.c | 38 src/mesa/drivers/dri/i965/intel_regions.c | 2 src/mesa/drivers/dri/i965/intel_regions.h | 1 src/mesa/drivers/dri/i965/intel_screen.c | 14 src/mesa/drivers/dri/i965/intel_screen.h | 1 src/mesa/drivers/dri/i965/intel_tex_layout.c | 1 src/mesa/drivers/dri/i965/server/i830_common.h | 19 src/mesa/drivers/dri/intel/intel_tex_layout.c | 102 src/mesa/drivers/dri/intel/intel_tex_layout.h | 41 src/mesa/drivers/dri/mach64/mach64_context.c | 82 src/mesa/drivers/dri/mach64/mach64_context.h | 57 src/mesa/drivers/dri/mach64/mach64_lock.c | 7 src/mesa/drivers/dri/mach64/mach64_screen.c | 4 src/mesa/drivers/dri/mach64/mach64_state.c | 4 src/mesa/drivers/dri/mach64/mach64_tex.c | 131 src/mesa/drivers/dri/mach64/mach64_tex.h | 10 src/mesa/drivers/dri/mach64/mach64_texmem.c | 655 --- src/mesa/drivers/dri/mach64/mach64_texstate.c | 135 src/mesa/drivers/dri/mach64/mach64_tris.c | 17 src/mesa/drivers/dri/mga/mga_xmesa.c | 10 src/mesa/drivers/dri/mga/mgastate.c | 4 src/mesa/drivers/dri/nouveau/Makefile | 53 src/mesa/drivers/dri/nouveau/nouveau_bufferobj.c | 616 +++ src/mesa/drivers/dri/nouveau/nouveau_bufferobj.h | 77 src/mesa/drivers/dri/nouveau/nouveau_buffers.c | 434 ++ src/mesa/drivers/dri/nouveau/nouveau_buffers.h | 48 src/mesa/drivers/dri/nouveau/nouveau_card.c | 17 src/mesa/drivers/dri/nouveau/nouveau_card.h | 49 src/mesa/drivers/dri/nouveau/nouveau_card_list.h | 232 + src/mesa/drivers/dri/nouveau/nouveau_context.c | 378 ++ src/mesa/drivers/dri/nouveau/nouveau_context.h | 236 + src/mesa/drivers/dri/nouveau/nouveau_ctrlreg.h | 44 src/mesa/drivers/dri/nouveau/nouveau_dri.h | 28 src/mesa/drivers/dri/nouveau/nouveau_driver.c | 146 src/mesa/drivers/dri/nouveau/nouveau_driver.h | 42 src/mesa/drivers/dri/nouveau/nouveau_fifo.c | 142 src/mesa/drivers/dri/nouveau/nouveau_fifo.h | 195 + src/mesa/drivers/dri/nouveau/nouveau_lock.c | 81 src/mesa/drivers/dri/nouveau/nouveau_lock.h | 69 src/mesa/drivers/dri/nouveau/nouveau_msg.h | 67 src/mesa/drivers/dri/nouveau/nouveau_object.c | 117 src/mesa/drivers/dri/nouveau/nouveau_object.h | 47 src/mesa/drivers/dri/nouveau/nouveau_query.c | 198 + src/mesa/drivers/dri/nouveau/nouveau_query.h | 38 src/mesa/drivers/dri/nouveau/nouveau_reg.h | 1505 +++++++++ src/mesa/drivers/dri/nouveau/nouveau_screen.c | 382 ++ src/mesa/drivers/dri/nouveau/nouveau_screen.h | 61 src/mesa/drivers/dri/nouveau/nouveau_shader.c | 832 +++++ src/mesa/drivers/dri/nouveau/nouveau_shader.h | 454 ++ src/mesa/drivers/dri/nouveau/nouveau_shader_0.c | 1046 ++++++ src/mesa/drivers/dri/nouveau/nouveau_shader_1.c | 16 src/mesa/drivers/dri/nouveau/nouveau_shader_2.c | 263 + src/mesa/drivers/dri/nouveau/nouveau_span.c | 125 src/mesa/drivers/dri/nouveau/nouveau_span.h | 39 src/mesa/drivers/dri/nouveau/nouveau_state.c | 345 ++ src/mesa/drivers/dri/nouveau/nouveau_state.h | 50 src/mesa/drivers/dri/nouveau/nouveau_state_cache.c | 69 src/mesa/drivers/dri/nouveau/nouveau_state_cache.h | 29 src/mesa/drivers/dri/nouveau/nouveau_swtcl.c | 127 src/mesa/drivers/dri/nouveau/nouveau_swtcl.h | 55 src/mesa/drivers/dri/nouveau/nouveau_sync.c | 194 + src/mesa/drivers/dri/nouveau/nouveau_sync.h | 67 src/mesa/drivers/dri/nouveau/nouveau_tex.c | 49 src/mesa/drivers/dri/nouveau/nouveau_tex.h | 38 src/mesa/drivers/dri/nouveau/nv04_state.c | 540 +++ src/mesa/drivers/dri/nouveau/nv04_swtcl.c | 619 +++ src/mesa/drivers/dri/nouveau/nv04_swtcl.h | 12 src/mesa/drivers/dri/nouveau/nv10_state.c | 798 ++++ src/mesa/drivers/dri/nouveau/nv10_swtcl.c | 656 +++ src/mesa/drivers/dri/nouveau/nv10_swtcl.h | 40 src/mesa/drivers/dri/nouveau/nv20_shader.h | 121 src/mesa/drivers/dri/nouveau/nv20_state.c | 824 ++++ src/mesa/drivers/dri/nouveau/nv20_vertprog.c | 447 ++ src/mesa/drivers/dri/nouveau/nv30_fragprog.c | 742 ++++ src/mesa/drivers/dri/nouveau/nv30_shader.h | 379 ++ src/mesa/drivers/dri/nouveau/nv30_state.c | 980 +++++ src/mesa/drivers/dri/nouveau/nv30_vertprog.c | 367 ++ src/mesa/drivers/dri/nouveau/nv40_fragprog.c | 224 + src/mesa/drivers/dri/nouveau/nv40_shader.h | 467 ++ src/mesa/drivers/dri/nouveau/nv40_vertprog.c | 778 ++++ src/mesa/drivers/dri/nouveau/nv50_state.c | 641 +++ src/mesa/drivers/dri/r128/r128_context.c | 8 src/mesa/drivers/dri/r128/r128_screen.c | 2 src/mesa/drivers/dri/r128/r128_state.c | 4 src/mesa/drivers/dri/r200/.gitignore | 3 src/mesa/drivers/dri/r200/Makefile | 6 src/mesa/drivers/dri/r200/r200_context.c | 32 src/mesa/drivers/dri/r200/r200_context.h | 135