Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit 'origin/gallium-0.1' into gallium-tex-surfaces | Keith Whitwell | 2008-05-07 | 1 | -24/+19 |
|\ | |||||
| * | mesa: free shader program data before deleting shader objects. | Brian | 2008-05-06 | 1 | -0/+16 |
| | | | | | | | | | | Picked from master. Fixes mem corruption seen when glean/api2 test exits. | ||||
| * | gallium: implement full reference counting for vertex/fragment programs | Brian | 2008-05-06 | 11 | -74/+170 |
| | | | | | | | | | | | | Use _mesa_reference_vert/fragprog() wherever we assign program pointers. Fixes a memory corruption bug found with glean/api2 test. Another memory bug involving shaders yet to be fixed... | ||||
| * | mesa: comments, whitespace | Brian | 2008-05-06 | 1 | -24/+19 |
| | | |||||
| * | gallium: change calculate_first_last_level() to match gallium-tex-surfaces ↵ | Brian Paul | 2008-05-06 | 1 | -1/+1 |
| | | | | | | | | branch | ||||
* | | mesa: free shader program data before deleting shader objects. | Brian Paul | 2008-05-07 | 1 | -0/+16 |
| | | | | | | | | | | Picked from master. Fixes mem corruption seen when glean/api2 test exits. | ||||
* | | gallium: implement full reference counting for vertex/fragment programs | Brian Paul | 2008-05-07 | 11 | -74/+170 |
| | | | | | | | | | | | | | | | | Use _mesa_reference_vert/fragprog() wherever we assign program pointers. Fixes a memory corruption bug found with glean/api2 test. Another memory bug involving shaders yet to be fixed... Picked from gallium-0.1 | ||||
* | | Revert "gallium: move setup of dest_surface in do_copy_texsubimage()" | Michel Dänzer | 2008-05-07 | 1 | -10/+11 |
| | | | | | | | | | | | | | | This reverts commit f7dbd18371f9cb6686b6a97642b3ca5577e83472. Looks like an accidental revert of commit 650c57f19398800dfdcf357b6e9ec7b68bfa34f1. | ||||
* | | gallium: re-enable temporarily disabled code in do_copy_texsubimage() | Brian Paul | 2008-05-06 | 1 | -1/+1 |
| | | |||||
* | | gallium: create drawing surfaces as GPU_READ/WRITE only | Brian Paul | 2008-05-06 | 6 | -49/+129 |
| | | | | | | | | | | Create different temporary surfaces for CPU_READ/WRITE when needed (such as for glReadPixels, glAccum, some glCopy/DrawPixels, glCopyTexSubImage, etc). | ||||
* | | gallium: create renderbuffer surface w/out CPU_READ/WRITE flags | Michal Danzer | 2008-05-06 | 1 | -2/+0 |
| | | |||||
* | | gallium: move setup of dest_surface in do_copy_texsubimage() | Michal Danzer | 2008-05-06 | 1 | -11/+10 |
| | | |||||
* | | gallium: sync up texture/sampler changes with master | Brian Paul | 2008-05-06 | 2 | -12/+14 |
| | | |||||
* | | gallium: Make sure to release texture surfaces (at the right time). | Michel Dänzer | 2008-05-06 | 2 | -1/+4 |
| | | |||||
* | | gallium: glCopyTexSubImage improvement. | Michel Dänzer | 2008-05-06 | 1 | -10/+11 |
| | | | | | | | | | | Only get a texture surface for attempting an accelerated copy, and mark it for GPU use only. | ||||
* | | Merge commit 'origin/gallium-0.1' into gallium-tex-surfaces | Keith Whitwell | 2008-05-06 | 7 | -63/+53 |
|\| | | | | | | | | | | | | | Conflicts: src/mesa/state_tracker/st_atom_sampler.c src/mesa/state_tracker/st_cb_texture.c | ||||
| * | fix _mesa_ffs for alternative compilers | Alan Hourihane | 2008-05-05 | 1 | -19/+17 |
| | | |||||
| * | declare atoms as extern | Alan Hourihane | 2008-05-05 | 1 | -14/+14 |
| | | |||||
| * | gallium: fix warnings | Brian Paul | 2008-05-03 | 1 | -1/+3 |
| | | |||||
| * | gallium: fix sampler->max_lod computation | Brian Paul | 2008-05-03 | 1 | -2/+3 |
| | | |||||
| * | gallium: fix computation of sampler->min_lod | Brian Paul | 2008-05-03 | 1 | -1/+1 |
| | | | | | | | | | | The texture BaseLevel is accounted for in texture layout so it doesn't factor in here. May also need to adjust max_lod... | ||||
| * | gallium: minor code, comments clean-up | Brian Paul | 2008-05-02 | 1 | -26/+16 |
| | | |||||
| * | gallium: in st_finalize_texture() check texture dimensions | Brian Paul | 2008-05-02 | 1 | -1/+4 |
| | | | | | | | | | | | | Check dimensions in addition to target, format, etc. Fixes a bug where we failed to detect a change in texture image sizes and wound up using the old texture data. | ||||
| * | gallium: Reallocate pipe_texture in st_TexImage if the texture object was used. | Michel Dänzer | 2008-05-02 | 3 | -8/+10 |
| | | | | | | | | Fixes problems with interleaved glTexImage and rendering calls. | ||||
| * | snprintf -> util_snprintf | Alan Hourihane | 2008-05-02 | 1 | -6/+6 |
| | | |||||
* | | gallium: fix some BaseLevel, lastLevel bugs | Brian Paul | 2008-05-03 | 2 | -3/+7 |
| | | |||||
* | | gallium: set template.target = PIPE_TEXTURE_2D | Brian Paul | 2008-05-02 | 1 | -0/+1 |
| | | |||||
* | | gallium: identify depth-stencil textures | Keith Whitwell | 2008-05-02 | 1 | -2/+14 |
| | | | | | | | | And don't use the display-target path to allocate them. | ||||
* | | gallium: Add texture usage flags, special-case allocation of display targets | Keith Whitwell | 2008-05-02 | 7 | -17/+38 |
| | | | | | | | | | | | | | | | | | | | | | | For many envirionments it's necessary to allocate display targets in a window-system friendly manner. Add facilities so that a driver can tell if a texture is likely to be used to generate a display surface and if use special allocation paths if necessary. Hook up softpipe to call into the winsys->surface_alloc_storage() routine in this case, though we probably want to change that interface slightly also. | ||||
* | | gallium: remove usage of winsys->surface_alloc_storage from state tracker | Keith Whitwell | 2008-05-02 | 1 | -76/+62 |
| | | | | | | | | | | | | | | | | | | Allocate a texture containing storage instead. Also clean up ACCUM buffer allocation slightly -- drivers will need some changes to texture allocation logic to accomodate the concept of a texture that will only as image storage by the CPU, but it's cleaner than it was. | ||||
* | | Merge branch 'gallium-0.1' into gallium-tex-surfaces | Keith Whitwell | 2008-05-02 | 21 | -140/+107 |
|\| | |||||
| * | revert mode change back to 644 | Alan Hourihane | 2008-05-02 | 3 | -0/+0 |
| | | |||||
| * | inline -> INLINE | Alan Hourihane | 2008-05-02 | 1 | -2/+2 |
| | | |||||
| * | Some changed for non-C99 compilers | Alan Hourihane | 2008-05-02 | 17 | -118/+94 |
| | | |||||
| * | gallium: Set sampler->min_lod instead of always reallocating pipe_textures. | Michel Dänzer | 2008-05-01 | 2 | -16/+3 |
| | | |||||
| * | mesa: squash harmless warning | Keith Whitwell | 2008-05-01 | 1 | -1/+1 |
| | | |||||
| * | Fix build problem with MSVC | Alan Hourihane | 2008-05-01 | 1 | -3/+7 |
| | | |||||
* | | gallium: use screen->tex_surface_release() | Brian Paul | 2008-05-01 | 1 | -2/+2 |
| | | |||||
* | | gallium: tex surface checkpoint | Keith Whitwell | 2008-05-01 | 10 | -89/+137 |
|/ | |||||
* | gallium: remove old files | Brian Paul | 2008-04-30 | 2 | -143/+0 |
| | |||||
* | gallium: fix texture border removal bug | Brian Paul | 2008-04-30 | 1 | -0/+4 |
| | |||||
* | gallium: use the newer PIPE_FORMAT_x_UNORM format names | Brian Paul | 2008-04-30 | 2 | -18/+18 |
| | |||||
* | Add support for GL_REPLACE_EXT texture env mode. | Brian Paul | 2008-04-30 | 1 | -1/+6 |
| | | | | | | GL_REPLACE_EXT comes from the ancient GL_EXT_texture extension. Found an old demo that actually uses it. The values of the GL_REPLACE and GL_REPLACE_EXT tokens is different, unfortunately. | ||||
* | gallium: use new buffer wrapper functions in p_inlines.h | Brian Paul | 2008-04-30 | 10 | -89/+62 |
| | | | | This allows us to remove most of the direct references to winsys in the state tracker. | ||||
* | gallium: consolidate the bitmap->texel conversion code | Brian Paul | 2008-04-30 | 1 | -96/+67 |
| | |||||
* | gallium: create a new texture each time we init/flush the bitmap cache | Brian Paul | 2008-04-30 | 1 | -38/+42 |
| | |||||
* | gallium: simplify texture format selection | Brian Paul | 2008-04-30 | 2 | -40/+18 |
| | |||||
* | gallium: flush pipe before updating bitmap texture | Brian Paul | 2008-04-29 | 1 | -1/+5 |
| | | | | Fixes duplicated text bug in progs/tests/texwrap.c | ||||
* | gallium: added some assertions to st_render_texture() to check surface format | Brian Paul | 2008-04-29 | 1 | -0/+2 |
| | | | | Make sure we can really render to the texture surface given its format. | ||||
* | gallium: fix broken GL_DEPTH_COMPONENT case in fallback_copy_texsubimage() | Brian Paul | 2008-04-29 | 1 | -19/+40 |
| | | | | Also, make sure surfaces are suitable for blitting before calling util_blit_pixels(). |