summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'origin/master' into i965g-restartKeith Whitwell2009-12-211011-34628/+68128
|\ | | | | | | | | | | | | Conflicts: SConstruct configs/default configs/linux-dri
| * tgsi: fix ureg emit after version token changeKeith Whitwell2009-12-011-1/+1
| |
| * st/xorg: fix merge droppingsKeith Whitwell2009-12-012-68/+0
| | | | | | | | These were stranded in emacs and not saved before committing.
| * Merge commit 'origin/tgsi-simplify-ext'Keith Whitwell2009-12-01104-2500/+1718
| |\ | | | | | | | | | | | | Conflicts: src/gallium/drivers/r300/r300_vs.c
| | * vega: Update shader headers.Michal Krol2009-11-273-14/+14
| | | | | | | | | | | | Drop the 1.1 version suffix.
| | * python/tests: Update shader headers.Michal Krol2009-11-2758-63/+63
| | | | | | | | | | | | Drop the 1.1 version suffix.
| | * svga: Update text shader header.Michal Krol2009-11-271-1/+1
| | |
| | * vl: Do not emit tgsi_version token.Michal Krol2009-11-272-32/+24
| | |
| | * tgsi: Remove tgsi_version token.Michal Krol2009-11-2711-72/+18
| | |
| | * gallium: Remove tgsi_version token.Michal Krol2009-11-271-6/+0
| | | | | | | | | | | | Not really needed, never served its purpose.
| | * tgsi: Fix token builder.Michal Krol2009-11-252-41/+2
| | |
| | * tgsi: Update raw token dumper after token definition changes.Michal Krol2009-11-251-116/+32
| | |
| | * tgsi: rename fields of tgsi_full_src_register to reduce verbosityKeith Whitwell2009-11-2432-575/+575
| | | | | | | | | | | | | | | | | | | | | SrcRegister -> Register SrcRegisterInd -> Indirect SrcRegisterDim -> Dimension SrcRegisterDimInd -> DimIndirect
| | * tgsi: rename fields of tgsi_full_dst_register to reduce verbosityKeith Whitwell2009-11-2431-283/+283
| | | | | | | | | | | | | | | DstRegister -> Register DstRegisterInd -> Indirect
| | * tgsi: rename fields of tgsi_full_declaration to reduce verbosityKeith Whitwell2009-11-2429-109/+109
| | | | | | | | | | | | DeclarationRange -> Range
| | * tgsi: rename fields of tgsi_full_instruction to avoid excessive verbosityKeith Whitwell2009-11-2431-678/+678
| | | | | | | | | | | | | | | | | | | | | | | | InstructionPredicate -> Predicate InstructionLabel -> Label InstructionTexture -> Texture FullSrcRegisters -> Src FullDstRegisters -> Dst
| | * tgsi: reduce repetition of structure name in its membersKeith Whitwell2009-11-2422-141/+141
| | | | | | | | | | | | | | | Rename Semantic.SemanticName to Semantic.Name. Similar for SemanticIndex, and the members of the tgsi_version struct.
| | * tgsi: remove unnecessary full_token init and free functionsKeith Whitwell2009-11-242-27/+0
| | |
| | * tgsi: remove unused Flags member from full_instructionKeith Whitwell2009-11-242-3/+0
| | |
| | * gallium: try and update r300 and nv drivers for tgsi changesKeith Whitwell2009-11-249-17/+17
| | | | | | | | | | | | | | | | | | | | | | | | It would be nice if these drivers built under the linux-debug header so that these types of interface changes can be minimally propogated into those drivers by people without the hardware. They don't have to generate a working driver -- though a command-dumping winsys would be an excellent for regression checking.
| | * gallium: simplify tgsi tokens furtherKeith Whitwell2009-11-2417-721/+160
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Drop anonymous 'Extended' fields, have every optional token named explicitly in its parent. Eg. there is now an Instruction.Label flag, etc. Drop destination modifiers and other functionality which cannot be generated by tgsi_ureg.c, which is now the primary way of creating shaders. Pull source modifiers into the source register token, drop the second negate flag. The source register token is now full - if we need to expand it, probably best to move all of the modifiers to a new token and have a single flag for it.
| * | Merge commit 'origin/mesa_7_7_branch'Keith Whitwell2009-12-0160-1325/+1476
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gallium/drivers/svga/svga_screen_texture.c src/gallium/state_trackers/xorg/xorg_composite.c src/gallium/state_trackers/xorg/xorg_exa.c src/gallium/state_trackers/xorg/xorg_renderer.c src/gallium/state_trackers/xorg/xorg_xv.c src/mesa/main/texgetimage.c src/mesa/main/version.h
| | * | mesa: set version string to 7.7-rc1mesa_7_7_rc1Ian Romanick2009-11-301-1/+1
| | | |
| | * | Merge branch 'mesa_7_6_branch' into mesa_7_7_branchIan Romanick2009-11-3015-416/+103
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: progs/util/shaderutil.c src/mesa/drivers/dri/r600/r600_context.c src/mesa/main/version.h
| | | * | i915: Actually put i915PointParameterfv in the driver function table. Duh.Ian Romanick2009-11-301-0/+1
| | | | |
| | | * | i915: Fallback bit define missed on previous commitIan Romanick2009-11-291-0/+1
| | | | |
| | | * | i915: Round point sizes instead of truncate.Ian Romanick2009-11-291-1/+1
| | | | |
| | | * | i915: Enable point sprite coordinate generationIan Romanick2009-11-291-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support still isn't completely correct, but it's better. piglit point-sprite now passes. However, glean's pointSprite test fails. In that test the texture on the sprite is somehow inverted as though GL_POINT_SPRITE_COORD_ORIGIN were set to GL_LOWER_LEFT. i915 hardware shouldn't be able to do that! I believe there are also problems when not all texture units have GL_COORD_REPLACE set. The hardware enable seems to be all or nothing. Fixes bug #25313.
| | | * | Improve implementation of GL_POINT_SPRITE_COORD_ORIGIN errorsIan Romanick2009-11-251-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This enum is only supported for OpenGL 2.0. If a driver supports OpenGL 1.4 and GL_ARB_point_sprite, using this enum should generate an error. This is important because, for example, i915 and i830 can support GL_ARB_point_sprite, but they cannot support GL_POINT_SPRITE_COORD_ORIGIN. This commit just removes the check for NV_point_sprite, which is completely wrong, and add some comments describing what the code should do. I don't see an easy way to check for version >= 2.0 from inside Mesa. Perhaps we should add an extension GL_MESA_point_sprite_20 (like Intel's old GL_EXT_packed_pixels_12) to indicate that this added bit of functionality is available. Also note that glean's pointSprite test only checks for GL_ARB_point_sprite before trying to use GL_POINT_SPRITE_COORD_ORIGIN. Naturally, that fails on non-2.0 implementations (i.e., Mac OS X on GMA 950).
| | | * | radeon: fix context destroy needing lock for flushing.Dave Airlie2009-11-251-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thanks to Intel code which I've just stolen pretty much as usual. This fixes fdo bug 22851 which is a dri1 regression since rewrite. Tested by: fpiobaf (Fabio) on #radeon Signed-off-by: Dave Airlie <[email protected]>
| | | * | i915: Initialize Length and Offset fields when mapping a buffer objectIan Romanick2009-11-231-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes an assertion failure in _mesa_MapBufferARB. Fixes bugzilla #25253.
| | | * | shaderutil: Fix detection of shadersIan Romanick2009-11-231-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | Check for versions >= 2.0 (because some drivers return 3.0), and return GL_FALSE if shaders are not detected.
| | | * | autoconf: Fix case for not having packageJakob Bornecrantz2009-11-231-2/+2
| | | | | | | | | | | | | | | | | | | | (cherry picked from commit 5c4bdbd825934fe01330890d360b61caa06fdc8d)
| | | * | Fix the DRI swrast driver for big endian platforms.Michel Dänzer2009-11-232-43/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Too bad I didn't realize earlier how easy this could be... Fixes http://bugs.freedesktop.org/show_bug.cgi?id=22767 .
| | | * | docs: document fixes for AIXBrian Paul2009-11-191-0/+1
| | | | |
| | | * | gl: added mangled glXGetProcAddressARB defineTom Fogal2009-11-191-0/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Brian Paul <[email protected]>
| | | * | progs: Fix quoting issue with empty set of PROGRAM_DIRS.Tom Fogal2009-11-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Quotes are important to make sure the argument to test -n really is the empty string, but that requires stringifying PROGRAM_DIRS. Signed-off-by: Brian Paul <[email protected]>
| | | * | mesa: define 32bit byteswap for AIX.Tom Fogal2009-11-191-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes `xlib' driver build on AIX. Signed-off-by: Brian Paul <[email protected]>
| | | * | docs: removed VC6/7 project filesBrian Paul2009-11-191-0/+6
| | | | |
| | | * | docs: update news file for 7.6.1 releaseBrian Paul2009-11-191-0/+7
| | | | |
| | | * | docs: remove VC6/7 project file infoBrian Paul2009-11-191-23/+0
| | | | |
| | | * | mesa: omit VC6, VC7 project files from tarballsBrian Paul2009-11-191-5/+2
| | | | | | | | | | | | | | | | | | | | Only VC8 project file is known to work.
| | | * | windows: remove old VC6 project files directoryBrian Paul2009-11-191-333/+0
| | | | | | | | | | | | | | | | | | | | Very out of date, according to Karl Schultz.
| | | * | r600: disable compressed texture supportmesa_7_6_1_rc1Alex Deucher2009-11-181-0/+4
| | | | | | | | | | | | | | | | | | | | It's not implemented yet. fixes fdo bug 24047
| | | * | docs: Add note about r600Alex Deucher2009-11-181-0/+1
| | | | |
| | | * | Revert "radeon: Fix legacy bo not to reuse dma buffers before refcount is 1."Alex Deucher2009-11-181-7/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 284a7af274bc148f112bd0ebb40583923ee26b49. This breaks kde desktop effects. See fdo bug 24131
| | | * | mesa: set version string to 7.6.1-rc1Brian Paul2009-11-181-1/+1
| | | | |
| | | * | xorg/st: fixup builds against later dpms headers.Brian Paul2009-11-183-0/+13
| | | | | | | | | | | | | | | | | | | | (cherry picked from master, commit e9d6ab72be065becf7a077c33919d37faa8db92e)
| | | * | docs: i965 clipping fixBrian Paul2009-11-171-0/+1
| | | | |
| | * | | mesa: Fix array out-of-bounds access by _mesa_TexParameterf.Vinson Lee2009-11-291-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | _mesa_TexParameterf calls set_tex_parameterf, which uses the params argument as an array.