Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit 'origin/master' into gallium-0.2 | Alan Hourihane | 2008-10-27 | 9 | -104/+136 |
|\ | |||||
| * | intel: GL_FALSE on a BO if it won't be modified when mapping this BO. ↵ | Xiang, Haihao | 2008-10-26 | 1 | -1/+1 |
| | | | | | | | | (thanks Eric). | ||||
| * | i965: don't emit state when dri_bufmgr_check_aperture_space fails. | Xiang, Haihao | 2008-10-24 | 2 | -4/+12 |
| | | | | | | | | This ensures there is an unfilled batchbuffer used for emitting states again. Partial fix for #17964. | ||||
| * | intel: fallback for intelEmitCopyBlit. | Xiang, Haihao | 2008-10-24 | 1 | -10/+39 |
| | | | | | | | | | | Use _mesa_copy_rect instead of BLT operation if dri_bufmgr_check_aperture_space still fails after flushing batchbuffer. Partial fix for #17964. | ||||
| * | mesa: remove calls to _mesa_adjust_image_for_convolution(), use texImage fields | Brian Paul | 2008-10-23 | 1 | -14/+6 |
| | | | | | | | | The texImage->Width/Height fields will have the post-convolution width/height. | ||||
| * | mesa: move convolution image adjustment code for glCopyTexSubImage1/2/3D() | Brian Paul | 2008-10-22 | 1 | -15/+21 |
| | | | | | | | | Do it after initial error checking, after we know the texture's internal format. | ||||
| * | mesa: some re-org of glCopyTexSubImage1/2/3D() error checking | Brian Paul | 2008-10-22 | 1 | -33/+32 |
| | | |||||
| * | mesa: in textore.c, only adjust image for convolution if image is a color format | Brian Paul | 2008-10-22 | 3 | -14/+20 |
| | | | | | | | | | | Makes things consistant with the code in teximage.c. We only want to apply convolution to color formats (not depth/index formats) | ||||
| * | i915: fix carsh in i830_emit_state. (bug #17766) | Xiang, Haihao | 2008-10-21 | 1 | -1/+2 |
| | | |||||
| * | fix span issue with really old ddx and non-tcl r100 chips | Roland Scheidegger | 2008-10-16 | 1 | -1/+1 |
| | | |||||
| * | mesa: fix error codes in _mesa_GetObjectParameterivARB(), bug 17861 | Brian Paul | 2008-10-16 | 1 | -15/+6 |
| | | |||||
| * | i915: Texture instructions use r/t/oC/oD register as texture coordinate. | Xiang, Haihao | 2008-10-13 | 1 | -0/+13 |
| | | | | | | | | Fix http://bugs.freedesktop.org/show_bug.cgi?id=16287. | ||||
| * | intel: Add acceleration for glDrawPixels(GL_STENCIL_INDEX). | Eric Anholt | 2008-10-11 | 1 | -1/+196 |
| | | | | | | | | | | | | | | | | | | This is nasty because there's no way in GL to output data to the stencil buffer directly, so we have to do a dance to wrap the depth/stencil buffer in an ARGB renderbuffer. Improves performance of several oglconform testcases by better than a factor of 2. | ||||
* | | scons: ppc support. | Michel Dänzer | 2008-10-23 | 1 | -0/+4 |
| | | |||||
* | | gallium: Fix typo, PPC_FEATURE_HAS_ALTIVEC not PPC_FEATURES_... | Michel Dänzer | 2008-10-23 | 1 | -1/+1 |
| | | |||||
* | | Merge commit 'origin/gallium-0.1' into gallium-0.2 | Brian Paul | 2008-10-17 | 1 | -2/+2 |
|\ \ | | | | | | | | | | | | | | | | Conflicts: progs/trivial/tri.c | ||||
| * | | gallium: fix mis-matched malloc/free vs. aligned malloc/free | Brian Paul | 2008-10-17 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | Use aligned malloc/free for teximage data everywhere to be consistant. The mismatch didn't make any difference when HAVE_POSIX_MEMALIGN was defined. | ||||
* | | | Merge commit 'origin/gallium-0.1' into gallium-0.2 | Keith Whitwell | 2008-10-15 | 7 | -41/+98 |
|\| | | | | | | | | | | | | | | | | | Conflicts: src/mesa/main/context.c | ||||
| * | | mesa: modify fixed function vertex programs not to reference constant attributes | Keith Whitwell | 2008-10-14 | 2 | -30/+41 |
| | | | |||||
| * | | mesa: new _mesa_set_vp_override() function for driver-override of vertex program | Brian Paul | 2008-10-10 | 5 | -11/+57 |
| | | | | | | | | | | | | | | | | | | | | | | | | Patch provide by Keith. Used in state tracker by DrawPixels to indicate that the state tracker (driver) is using its own vertex program. This prevents the texenvprogram code from replacing conventional shader inputs with state vars. Fixes glDraw/CopyPixels regressions. | ||||
* | | | i915: Texture instructions use r/t/oC/oD register as texture coordinate. | Xiang, Haihao | 2008-10-15 | 1 | -0/+13 |
| | | | | | | | | | | | | Fix http://bugs.freedesktop.org/show_bug.cgi?id=16287. | ||||
* | | | intel: Add acceleration for glDrawPixels(GL_STENCIL_INDEX). | Eric Anholt | 2008-10-15 | 1 | -1/+196 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This is nasty because there's no way in GL to output data to the stencil buffer directly, so we have to do a dance to wrap the depth/stencil buffer in an ARGB renderbuffer. Improves performance of several oglconform testcases by better than a factor of 2. | ||||
* | | | dri: don't check the number of cliprects before swap, let | Alan Hourihane | 2008-10-14 | 1 | -3/+0 |
| | | | | | | | | | | | | the swap handle the requirements. | ||||
* | | | mesa: when emitting an address load instruction, for | Alan Hourihane | 2008-10-13 | 1 | -1/+5 |
| | | | | | | | | | | | | indexed elements ensure we write to a single register. | ||||
* | | | Merge commit 'origin/master' into gallium-0.2 | Brian Paul | 2008-10-10 | 8 | -57/+35 |
|\ \ \ | | |/ | |/| | |||||
| * | | mesa: fix asst. issues in _mesa_texstore_argb8888() | Brian Paul | 2008-10-10 | 1 | -40/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | If we shift bytes into the texel word (or use the PACK_COLOR_8888 macro), we don't have to worry about big vs. little endian. See comments about texel formats in texformat.h. Remove an unneeded/incorrect else-if clause that produced wrong results on big-endian systems. | ||||
| * | | mesa: include needed header | Brian Paul | 2008-10-10 | 1 | -0/+1 |
| | | | |||||
| * | | mesa: remove unneeded includes | Brian Paul | 2008-10-10 | 2 | -2/+0 |
| | | | |||||
| * | | mesa: fix error codes in _mesa_GetObjectParameterivARB(), bug 17861 | Brian Paul | 2008-10-10 | 1 | -1/+12 |
| | | | |||||
| * | | mesa: rename macro params to emphasize that there's no particular color ordering | Brian Paul | 2008-10-10 | 1 | -12/+12 |
| | | | |||||
| * | | mesa: remove unneeded includes | Brian Paul | 2008-10-10 | 2 | -2/+0 |
| | | | |||||
| * | | intel: GLSL 1.20 is broken in Mesa, so disable it in the i965 driver | Ian Romanick | 2008-10-10 | 1 | -0/+4 |
| | | | |||||
| * | | i965: Add missing intel_pixel_draw.c symlink to fix build. | Eric Anholt | 2008-10-10 | 1 | -0/+1 |
| | | | |||||
* | | | intel: GLSL 1.20 is broken in Mesa, so disable it in the i965 driver | Ian Romanick | 2008-10-10 | 1 | -0/+4 |
| | | | |||||
* | | | i965: Add missing intel_pixel_draw.c symlink to fix build. | Eric Anholt | 2008-10-10 | 1 | -0/+1 |
| | | | |||||
* | | | Merge commit 'origin/master' into gallium-0.2 | Keith Whitwell | 2008-10-10 | 56 | -1963/+828 |
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: src/mesa/glapi/descrip.mms src/mesa/shader/grammar/descrip.mms | ||||
| * | | i965: Accelerate depth textures with border color. | Eric Anholt | 2008-10-09 | 2 | -6/+20 |
| | | | | | | | | | | | | | | | The fallback was introduced to fix bug #16697, but made the test it was fixing run excessively long. | ||||
| * | | i965: Actually hook up the accelerated DrawPixels support. | Eric Anholt | 2008-10-09 | 3 | -3/+3 |
| | | | |||||
| * | | i915: Accelerate depth textures with border color. | Eric Anholt | 2008-10-08 | 2 | -8/+16 |
| | | | | | | | | | | | | | | | The fallback was introduced to fix bug #16697, but made the test it was fixing run excessively long. | ||||
| * | | mesa: vertex emit debug code (disabled) | Brian Paul | 2008-10-08 | 1 | -22/+58 |
| | | | |||||
| * | | mesa: fix vertex format/attribute bug | Brian Paul | 2008-10-08 | 1 | -5/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | If the tnl output attributes matches the swsetup input attributes we still need to check if the desired vertex color type (float vs. chan) has changed so that we use the right emit functions. Fixes a conformance failure found with logicop test at pathlevel 3. | ||||
| * | | mesa: Pass the context to query object delete cb to avoid null dereference. | Eric Anholt | 2008-10-07 | 1 | -1/+1 |
| | | | |||||
| * | | i965: Add ARB_occlusion_query support. | Eric Anholt | 2008-10-07 | 9 | -52/+331 |
| | | | |||||
| * | | intel: Push flushing for cliprects changes down into the cliprects changes. | Eric Anholt | 2008-10-07 | 1 | -6/+22 |
| | | | | | | | | | | | | | | | | | | This lets us short-circuit when we're leaving the same cliprects in place, which becomes quite common with metaops clears, and may be useful for some of our FBO paths. | ||||
| * | | i965: Fix a potential assertion failure. | Xiang, Haihao | 2008-10-08 | 1 | -2/+4 |
| | | | |||||
| * | | mesa: pass 'mask', not NULL to renderbuffer->Put functions | Brian Paul | 2008-10-07 | 1 | -10/+10 |
| | | | | | | | | | | | | Fixes bug 17800. | ||||
| * | | mesa: fix convolve/convolution mix-ups | Brian | 2008-10-06 | 2 | -3/+3 |
| | | | |||||
| * | | mesa: set FRAG_BIT_FOGC bit in InputsUsed if FogOption!=GL_NONE | Brian Paul | 2008-10-06 | 1 | -0/+3 |
| | | | |||||
| * | | mesa: adjust texcoords for swrast sprite points. | Brian Paul | 2008-10-06 | 1 | -2/+2 |
| | | | | | | | | | | | | Fixes glean pointSprite test w/ software rendering | ||||
| * | | mesa: updated _mesa_delete_query() comments | Brian Paul | 2008-10-06 | 1 | -2/+1 |
| | | |