Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'mesa_7_6_branch' into mesa_7_7_branch | Ian Romanick | 2009-12-07 | 4 | -24/+29 |
|\ | | | | | | | | | | | | | | | | | | | | | | | Conflicts: progs/demos/projtex.c progs/xdemos/glxinfo.c src/mesa/main/version.h To fix the confilicts in projtex.c and glxinfo.c I just took the code from mesa_7_6_branch. The conflicts seem to have occured from cherry-picks from mesa_7_7_branch to mesa_7_6_branch followed by commmits just to mesa_7_6_branch. | ||||
| * | radeon: fix polygon stipple | Alex Deucher | 2009-12-04 | 4 | -24/+29 |
| | | | | | | | | | | | | fixes fdo bug 25354 Signed-off-by: Alex Deucher <[email protected]> | ||||
* | | radeon: fix cases when only first image where put directly into miptree. | Maciej Cencora | 2009-12-07 | 1 | -3/+3 |
| | | | | | | | | Make sure that minimal width, height and depth of texture image is 1. | ||||
* | | radeon: fix image migration for small compressed textures | Maciej Cencora | 2009-12-07 | 1 | -14/+9 |
| | | | | | | | | memcpy would give incorrect results if src rowstride != dst rowstride | ||||
* | | radeon: workaround an FBO issue | Maciej Cencora | 2009-12-03 | 2 | -0/+9 |
| | | | | | | | | Fixes #21501 | ||||
* | | radeon: properly check if image should be placed in the miptree | Maciej Cencora | 2009-12-03 | 1 | -1/+4 |
| | | | | | | | | Fixes #25355 | ||||
* | | Revert "radeon/r300: no need to flush the cmdbuf when changing scissors ↵ | Dave Airlie | 2009-12-02 | 1 | -3/+1 |
| | | | | | | | | | | | | | | | | | | state in KMM mode" This reverts commit 286bf89e5a1fc931dbf523ded861b809859485e2. This doesn't appear to be correct, regression so revert it. http://bugs.freedesktop.org/show_bug.cgi?id=25193 | ||||
* | | Merge branch 'mesa_7_6_branch' into mesa_7_7_branch | Ian Romanick | 2009-11-30 | 1 | -7/+2 |
|\| | | | | | | | | | | | | | Conflicts: progs/util/shaderutil.c src/mesa/drivers/dri/r600/r600_context.c src/mesa/main/version.h | ||||
| * | radeon: fix context destroy needing lock for flushing. | Dave Airlie | 2009-11-25 | 1 | -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]> | ||||
| * | Revert "radeon: Fix legacy bo not to reuse dma buffers before refcount is 1." | Alex Deucher | 2009-11-18 | 1 | -7/+2 |
| | | | | | | | | | | | | This reverts commit 284a7af274bc148f112bd0ebb40583923ee26b49. This breaks kde desktop effects. See fdo bug 24131 | ||||
* | | radeon: update miptree code a little | Maciej Cencora | 2009-11-29 | 3 | -55/+61 |
| | | | | | | | | | | Simplify gl image level <-> miptree level mapping (are equal now). Don't allocate miptree for images that won't fit in it (fixes #25230). | ||||
* | | radeon: don't check the same miptree many times when looking for matching ↵ | Maciej Cencora | 2009-11-29 | 1 | -3/+3 |
| | | | | | | | | miptrees | ||||
* | | radeon: add some debugging info | Maciej Cencora | 2009-11-29 | 2 | -0/+25 |
| | | |||||
* | | radeon: need to flush cs when moving images between mipmap trees | Maciej Cencora | 2009-11-28 | 1 | -0/+4 |
| | | |||||
* | | radeon: fix context destroy needing lock for flushing. | Dave Airlie | 2009-11-25 | 1 | -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]> | ||||
* | | radeon: fix errors in miptree related function | Maciej Cencora | 2009-11-23 | 1 | -3/+8 |
| | | | | | | | | | | | | - typo - memory leak - off by one (spotted by airlied) | ||||
* | | radeon: fix compressed mipmapped textures | Maciej Cencora | 2009-11-21 | 2 | -22/+29 |
| | | | | | | | | Tested on r300 only, other cards may require adjusting texture_compressed_row_align. | ||||
* | | radeon: fix glCompressedTexSubImage | Maciej Cencora | 2009-11-21 | 1 | -10/+12 |
| | | |||||
* | | r100: fix texture_from_pixmap and compiz. | Dave Airlie | 2009-11-20 | 1 | -7/+10 |
| | | | | | | | | | | | | | | | | r100 state emission has separate rect and non-rect states, if we are doing TFP for a TEXTURE_2D we shouldn't use the rect states as they won't get emitted properly. Signed-off-by: Dave Airlie <[email protected]> | ||||
* | | Merge branch 'radeon-texrewrite-clean' into mesa_7_7_branch | Maciej Cencora | 2009-11-18 | 13 | -518/+569 |
|\ \ | |||||
| * | | radeon: align for mipmap tree changes | Maciej Cencora | 2009-11-17 | 3 | -30/+14 |
| | | | |||||
| * | | radeon: return false on texture validation if texture isn't complete | Maciej Cencora | 2009-11-14 | 1 | -3/+3 |
| | | | |||||
| * | | radeon: rework mipmap tree | Maciej Cencora | 2009-11-14 | 5 | -352/+396 |
| | | | |||||
| * | | radeon: more texture code refactoring | Maciej Cencora | 2009-11-14 | 1 | -116/+92 |
| | | | |||||
| * | | radeon: minor refactoring of texture code | Maciej Cencora | 2009-11-14 | 1 | -11/+46 |
| | | | | | | | | | | | | Also properly set dstImageOffsets for TexSubImage case. | ||||
| * | | radeon: rework mipmap tree reference counting | Maciej Cencora | 2009-11-14 | 3 | -20/+22 |
| | | | |||||
| * | | radeon: use radeon_bo_is_referenced_by_cs for query objects | Maciej Cencora | 2009-11-14 | 4 | -23/+3 |
| | | | |||||
| * | | radeon/r300: don't flush cmdbuf if not necessary | Maciej Cencora | 2009-11-14 | 1 | -2/+14 |
| | | | |||||
| * | | radeon/r300: no need to flush the cmdbuf when changing scissors state in KMM ↵ | Maciej Cencora | 2009-11-14 | 1 | -1/+3 |
| | | | | | | | | | | | | mode | ||||
| * | | radeon: fix glBufferSubData | Maciej Cencora | 2009-11-14 | 1 | -0/+5 |
| | | | |||||
| * | | radeon: add radeon_bo_is_referenced_by_cs function | Maciej Cencora | 2009-11-14 | 1 | -0/+13 |
| | | | |||||
| * | | radeon: remove unnecessary call to radeonEmitState | Maciej Cencora | 2009-11-14 | 1 | -2/+0 |
| | | | | | | | | | | | | fixes bo space accounting errors | ||||
* | | | r300: fix reads and writes for MESA_FORMAT_S8Z24 buffer | Maciej Cencora | 2009-11-17 | 1 | -2/+3 |
| | | | | | | | | | | | | Regression was introduced by texformat-rework branch merge. | ||||
* | | | r600: More span breakage fixes. | Michel Dänzer | 2009-11-17 | 1 | -0/+12 |
| | | | | | | | | | | | | | | | At least now the compiler doesn't complain about implicitly declared functions anymore... | ||||
* | | | r600: Attempt to fix span breakage introduced by big endian fixes. | Michel Dänzer | 2009-11-17 | 1 | -0/+8 |
| | | | | | | | | | | | | | | | | | | Only compile tested; I happened to notice people on IRC reporting .../r600_dri.so: undefined symbol: radeon_ptr_2byte_8x2 | ||||
* | | | radeon: Depth/stencil span code fixes for big endian. | Michel Dänzer | 2009-11-17 | 1 | -24/+24 |
| | | | | | | | | | | | | Fixes e.g. text in progs/demos/arbocclude. | ||||
* | | | radeon: Fix occlusion queries on big endian. | Michel Dänzer | 2009-11-17 | 1 | -7/+9 |
| | | | |||||
* | | | radeon: Fix software fallbacks with KMS on big endian. | Michel Dänzer | 2009-11-17 | 1 | -0/+63 |
| | | | |||||
* | | | radeon: FBO fixes for big endian. | Michel Dänzer | 2009-11-17 | 2 | -11/+29 |
| | | | |||||
* | | | radeon: rn50's have no 3D engine so don't try and init 3D driver. | Dave Airlie | 2009-11-17 | 1 | -2/+4 |
|/ / | |||||
* | | radeon: add missing include | Dave Airlie | 2009-10-31 | 1 | -0/+1 |
| | | |||||
* | | radeon: use _mesa_get_current_tex_unit | Dave Airlie | 2009-10-31 | 1 | -1/+1 |
| | | |||||
* | | radeon: fix incorrect Z format in radeon_alloc_renderbuffer_storage() | Brian Paul | 2009-10-29 | 1 | -2/+2 |
| | | | | | | | | And update error message. | ||||
* | | Merge branch 'texformat-rework' | Brian Paul | 2009-10-28 | 11 | -275/+209 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/mesa/drivers/dri/radeon/radeon_fbo.c src/mesa/drivers/dri/s3v/s3v_tex.c src/mesa/drivers/dri/s3v/s3v_xmesa.c src/mesa/drivers/dri/trident/trident_context.c src/mesa/main/debug.c src/mesa/main/mipmap.c src/mesa/main/texformat.c src/mesa/main/texgetimage.c | ||||
| * | | radeon: add case for MESA_FORMAT_X8_Z24 in radeon_create_renderbuffer() | Brian Paul | 2009-10-27 | 1 | -1/+6 |
| | | | |||||
| * | | mesa: choose texture format in core mesa, not drivers | Brian Paul | 2009-10-25 | 3 | -6/+4 |
| | | | | | | | | | | | | | | | | | | Call the ctx->Driver.ChooseTextureFormat() function from core Mesa's _mesa_[Copy]TexImage functions instead of in the driver functions. One less thing for drivers to do. | ||||
| * | | mesa: remove calls to _mesa_compressed_row_stride() | Brian Paul | 2009-10-25 | 1 | -4/+4 |
| | | | |||||
| * | | mesa: remove _mesa_compressed_texture_size() | Brian Paul | 2009-10-24 | 1 | -1/+1 |
| | | | | | | | | | | | | Use _mesa_format_image_size() instead. | ||||
| * | | mesa: change compressed texture size calls | Brian Paul | 2009-10-24 | 1 | -6/+4 |
| | | | | | | | | | | | | | | | Replace calls to ctx->Driver.CompressedTextureSize with calls to _mesa_format_image_size. The former always called the later. | ||||
| * | | radeon: simplify radeon_create_renderbuffer() | Brian Paul | 2009-10-22 | 3 | -29/+27 |
| | | |