Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit 'origin/master' into gallium-0.2 | Keith Whitwell | 2008-09-23 | 6 | -12/+16 |
|\ | | | | | | | | | | | | | | | Conflicts: src/mesa/glapi/glapi_getproc.c src/mesa/main/image.c src/mesa/shader/slang/slang_link.c | ||||
| * | mesa: new gl_fragment_program fields indicating use of fog, front-facing, ↵ | Brian Paul | 2008-09-23 | 2 | -19/+36 |
| | | | | | | | | | | | | point coord (cherry picked from commit d7a7b0a10dd355fbeb7a404091a42d4ab558c820) | ||||
| * | Added new _mesa_clip_copytexsubimage() function to do avoid clipping down in ↵ | Brian | 2008-09-23 | 3 | -7/+60 |
| | | | | | | | | | | | | | | the drivers. This should probably be pulled into main-line Mesa... (cherry picked from commit 324ecadbfdf9b944e059832f146451e4151dcb21) | ||||
| * | mesa: refactor: move GetProcAddress code from glapi.c into new ↵ | Brian Paul | 2008-09-23 | 4 | -624/+656 |
| | | | | | | | | glapi_getproc.c file | ||||
| * | i965: Cope with batch getting flushed in the middle of batchbuffer emits. | Eric Anholt | 2008-09-23 | 5 | -12/+14 |
| | | | | | | | | | | | | | | | | | | This isn't required for GEM (at least, yet), but the check_aperture code for non-GEM results in batch getting flushed during emit. brw_state_upload restarts state emits, but a bunch of the state emit functions were assuming that they would be called exactly once, after prepare and before new_batch. Bug #17179. | ||||
| * | intel: Add missing include files for meta drawpixels since mesa shuffling. | Eric Anholt | 2008-09-23 | 1 | -0/+2 |
| | | |||||
* | | Merge commit 'origin/master' into gallium-0.2 | Keith Whitwell | 2008-09-23 | 4 | -298/+142 |
|\| | |||||
| * | intel: Replace pbo-only drawpixels function with a generic Mesa metaops. | Eric Anholt | 2008-09-23 | 1 | -276/+108 |
| | | | | | | | | Improves performance of some oglconform regression tests 9x. | ||||
| * | i915: Fix overlapping CopyPixels with negative pixel zoom. | Eric Anholt | 2008-09-23 | 1 | -4/+14 |
| | | | | | | | | Fixes a failure in pixel-pos.c oglconform test. | ||||
| * | i915: fix crash in flush_prim -> wait_flips -> flush_batch -> flush_prim. | Eric Anholt | 2008-09-23 | 1 | -17/+18 |
| | | |||||
| * | i965: Adapt to new TNL program tracking semantics | Ian Romanick | 2008-09-22 | 1 | -1/+2 |
| | | | | | | | | This fixes bugzilla #17718. | ||||
| * | r300: Adapt to the removal of _tnl_ProgramCacheInit() and friends. | Michel Dänzer | 2008-09-22 | 1 | -2/+1 |
| | | |||||
| * | Remove incorrect test from mmAllocMem. | Michel Dänzer | 2008-09-22 | 1 | -1/+1 |
| | | | | | | | | | | 0 is a perfectly valid alignment shift, see e.g. driTexturesGone() which was broken by this. | ||||
* | | remove leftover merge conflict markers | Keith Whitwell | 2008-09-23 | 1 | -4/+0 |
| | | |||||
* | | CELL: fix colormask code generation | Robert Ellison | 2008-09-23 | 1 | -83/+78 |
| | | | | | | | | | | | | | | | | | | The colormask code generation had assumed that its input packed pixels were in RGBA format. In fact, the format they're in is dependent on the pipe color format. Now the color format is passed in to gen_colormask(), and proper color format-dependent SPU code is generated. | ||||
* | | CELL: improve legibility of CELL_DEBUG environment variable output | Robert Ellison | 2008-09-23 | 1 | -1/+13 |
| | | |||||
* | | cell: Fixed bug with absolute, negate, set-negative logic in source fetch ↵ | Jonathan White | 2008-09-22 | 1 | -9/+5 |
| | | | | | | | | | | | | for TGSI instructions. The logic should operate on the origin channel not the swizzled channel. Please enter the commit message for your changes. | ||||
* | | cell: Added TRUNC, SWZ (extended) and XPD instructions, verified against ↵ | Jonathan White | 2008-09-22 | 1 | -45/+156 |
| | | | | | | | | softpipe. Optimized FLR and FRC. Fixed writeback logic for DP3, DP4 and DPH. | ||||
* | | cell: Added DPH instruction and verified against softpipe. | Jonathan White | 2008-09-22 | 1 | -0/+41 |
| | | |||||
* | | r300: Adapt to the removal of _tnl_ProgramCacheInit() and friends. | Michel Dänzer | 2008-09-22 | 1 | -2/+1 |
| | | |||||
* | | Remove incorrect test from mmAllocMem. | Michel Dänzer | 2008-09-22 | 1 | -1/+1 |
| | | | | | | | | | | 0 is a perfectly valid alignment shift, see e.g. driTexturesGone() which was broken by this. | ||||
* | | mesa: Remove left over merge conflicts | Jakob Bornecrantz | 2008-09-22 | 2 | -7/+0 |
| | | |||||
* | | Merge branch 'master' into gallium-0.2 | Keith Whitwell | 2008-09-21 | 16 | -89/+101 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/mesa/glapi/glapi.h src/mesa/main/api_exec.c src/mesa/main/attrib.c src/mesa/main/clear.c src/mesa/main/context.c src/mesa/main/mfeatures.h src/mesa/main/mipmap.c src/mesa/main/mipmap.h src/mesa/main/readpix.c src/mesa/main/sources src/mesa/main/state.c src/mesa/main/texformat.c src/mesa/main/texparam.c src/mesa/main/texstate.c src/mesa/vbo/vbo_context.c src/mesa/x86/common_x86_asm.S | ||||
| * | mesa: allow for extra per-context init | Brian Paul | 2008-09-21 | 3 | -4/+7 |
| | | | | | | | | (cherry picked from commit 815cdcfbc0740c66b901361620c88d99541bdad2) | ||||
| * | mesa: texture crop rect state | Brian Paul | 2008-09-21 | 3 | -1/+35 |
| | | | | | | | | (cherry picked from commit c01fbc7866d7cd5cf4263dffec6d9591470b4c23) | ||||
| * | mesa: set point state | Brian Paul | 2008-09-21 | 2 | -0/+8 |
| | | | | | | | | (cherry picked from commit af3d9dba562813ffed71691bffd7faf6665c4487) | ||||
| * | mesa: fix some feature tests | Brian Paul | 2008-09-21 | 2 | -6/+2 |
| | | | | | | | | (cherry picked from commit 74b14fe6ddbece8bc662aac4d3b2b18d8d853486) | ||||
| * | mesa: fix some pixel transfer state tests for depth formats | Brian Paul | 2008-09-21 | 1 | -5/+9 |
| | | | | | | | | (cherry picked from commit 966e199e409a1b52eef88e48997442250997f45e) | ||||
| * | mesa: fix issues causing warnings on Windows | Brian Paul | 2008-09-21 | 1 | -1/+9 |
| | | |||||
| * | mesa: Silence compiler warnings on Windows. | Michal Krol | 2008-09-21 | 3 | -7/+7 |
| | | |||||
| * | mesa: comments about vectors vs components | Brian Paul | 2008-09-21 | 2 | -3/+3 |
| | | |||||
| * | mesa: remove debug code | Brian Paul | 2008-09-21 | 1 | -1/+0 |
| | | |||||
| * | mesa: implement glGetUniformiv() with new ctx->Driver function | Brian Paul | 2008-09-21 | 1 | -0/+1 |
| | | | | | | | | The old implementation could overwrite the caller's param buffer. | ||||
| * | mesa: added case for fixed pt | Brian Paul | 2008-09-21 | 1 | -0/+5 |
| | | |||||
| * | mesa: point size arrays | Brian Paul | 2008-09-21 | 8 | -0/+74 |
| | | |||||
| * | mesa: Replace deprecated __MSC__ macro. | José Fonseca | 2008-09-21 | 2 | -2/+2 |
| | | |||||
| * | mesa: More signed/unsigned float/integer fixes. | José Fonseca | 2008-09-21 | 2 | -18/+18 |
| | | |||||
| * | mesa: Use appropriate unsigned/signed, float/integer types. | José Fonseca | 2008-09-21 | 2 | -3/+3 |
| | | |||||
| * | mesa: Use _mesa_bsearch. | José Fonseca | 2008-09-21 | 1 | -4/+4 |
| | | |||||
| * | mesa: bsearch implementation for WinCE. | José Fonseca | 2008-09-21 | 1 | -1/+18 |
| | | |||||
| * | mesa: ASSERT macro is already defined by WinCE headers. | José Fonseca | 2008-09-21 | 1 | -0/+2 |
| | | | | | | | | Even when just the standard headers are used.... | ||||
| * | mesa: init ctx->RenderMode | Brian Paul | 2008-09-21 | 1 | -0/+2 |
| | | |||||
| * | mesa: GL_BYTE vertex/texcoord arrays | Brian Paul | 2008-09-21 | 2 | -0/+11 |
| | | |||||
| * | mesa: initial support for fixed-pt vertex arrays | Brian Paul | 2008-09-21 | 3 | -0/+26 |
| | | |||||
| * | mesa: refactor: move initialization of DefaultPacking state. | Brian Paul | 2008-09-21 | 2 | -20/+20 |
| | | |||||
| * | mesa: fix errors in prev commit | Brian Paul | 2008-09-21 | 1 | -2/+2 |
| | | |||||
| * | mesa: revamp glBlendFunc loopback | Brian Paul | 2008-09-21 | 2 | -10/+9 |
| | | |||||
| * | mesa: fix some FEATURE_x tests | Brian Paul | 2008-09-21 | 1 | -6/+1 |
| | | |||||
| * | mesa: test for FEATURE_ATI_fragment_shader | Brian Paul | 2008-09-21 | 1 | -0/+2 |
| | | |||||
| * | mesa: fix ReadBuffer initialization | Brian Paul | 2008-09-21 | 1 | -0/+2 |
| | |