Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | mesa: implement per-buffer color masking | Brian Paul | 2009-12-29 | 2 | -14/+40 |
| | | | | | | | | | | | This is part of the GL_EXT_draw_buffers2 extension and part of GL 3.0. The ctx->Color.ColorMask field is now a 2-D array. Until drivers are modified to support per-buffer color masking, they can just look at the 0th color mask. The new _mesa_ColorMaskIndexed() function will be called by glColorMaskIndexedEXT() or glColorMaski(). | ||||
* | mesa: per-buffer blend enabled flags | Brian Paul | 2009-12-29 | 1 | -5/+13 |
| | | | | | | | | | | | | | | | ctx->Color.BlendEnabled is now a GLbitfield instead of a GLboolean to indicate blend on/off status for each color/draw buffer. This is infrastructure for GL_EXT_draw_buffers2 and OpenGL 3.x New functions include _mesa_EnableIndexed(), _mesa_DisableIndexed(), and _mesa_IsEnabledIndexed(). The enable function corresponds to glEnableIndexedEXT() for GL_EXT_draw_buffers2 or glEnablei() for GL3. Note that there's quite a few tests for ctx->Color.BlendEnabled != 0 in drivers, etc. Those tests can remain as-is since the mask will be 0 or ~0 unless GL_EXT_draw_buffers2 is enabled. | ||||
* | Merge branch 'mesa_7_7_branch' | Brian Paul | 2009-12-21 | 1 | -3/+3 |
|\ | | | | | | | | | | | Conflicts: src/mesa/main/version.h src/mesa/state_tracker/st_atom_shader.c | ||||
| * | mesa/meta: move BindTexture() call in _mesa_meta_GenerateMipmap() | Brian Paul | 2009-12-14 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | This is a follow-up to commit e3fa700c178e11e6735430119232919176ab7b42. The call to _mesa_BindTexture() must be before we set any other texture object state, namely the _mesa_TexParameteri() calls. This fixes bug 25601 (piglit gen-nonzero-unit failure). | ||||
* | | mesa: remove unused ctx->Driver.ActiveTexture() hook | Brian Paul | 2009-12-11 | 1 | -1/+0 |
|/ | |||||
* | meta: Bind texture to unit 0 for mipmap generation | Ian Romanick | 2009-12-09 | 1 | -0/+4 |
| | | | | | | | If the active texture unit on entry to mipmap generation is not zero, bind the texture to unit zero. Fixes bug #24219. | ||||
* | mesa: remove unused vertex array driver hooks | Brian Paul | 2009-11-16 | 1 | -13/+0 |
| | |||||
* | mesa: use _mesa_get_current_tex_object() | Brian Paul | 2009-11-02 | 1 | -6/+2 |
| | |||||
* | Merge branch 'texformat-rework' | Brian Paul | 2009-10-28 | 2 | -8/+8 |
|\ | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | mesa: remove ctx->Driver.CompressedTextureSize() hook | Brian Paul | 2009-10-24 | 1 | -1/+0 |
| | | | | | | | | It always just called _mesa_compressed_texture_size() anyway. | ||||
| * | mesa: replace gl_texture_format with gl_format | Brian Paul | 2009-09-30 | 1 | -1/+1 |
| | | | | | | | | | | | | Now gl_texture_image::TexFormat is a simple MESA_FORMAT_x enum. ctx->Driver.ChooseTexture format also returns a MESA_FORMAT_x. gl_texture_format will go away next. | ||||
| * | mesa: use _mesa_get_format_base_format() | Brian Paul | 2009-09-27 | 1 | -1/+2 |
| | | |||||
* | | mesa: s/Bilt/Blit | Brian Paul | 2009-10-27 | 1 | -1/+1 |
| | | |||||
* | | meta: Fix the BufferSubData in meta clear to be BufferData. | Eric Anholt | 2009-10-20 | 1 | -3/+2 |
| | | | | | | | | | | Fixes a 3.4% +/- 1.3% performance regression in my GL demo (n=3). The other meta code could probably also use the same treatment. | ||||
* | | mesa: remove unused ctx->Driver.PrioritizeTextures() hook | Brian Paul | 2009-10-14 | 1 | -1/+0 |
| | | |||||
* | | mesa: remove unused ctx->Driver.TextureMatrix() hook | Brian Paul | 2009-10-14 | 1 | -1/+0 |
| | | |||||
* | | mesa: remove left-over debug printf | Brian Paul | 2009-10-14 | 1 | -1/+0 |
| | | |||||
* | | mesa: whitespace fixes | Brian Paul | 2009-10-13 | 1 | -2/+2 |
| | | |||||
* | | mesa: do RTT check in _mesa_meta_check_generate_mipmap_fallback() | Brian Paul | 2009-10-13 | 1 | -7/+48 |
| | | | | | | | | | | | | | | We need to check that we can actually render to the texture's format before doing mipmap generation. This may fix bug 24219. | ||||
* | | mesa: save/set/restore texture base/wrap state in blitframebuffer_texture() | Brian Paul | 2009-10-12 | 1 | -4/+15 |
| | | |||||
* | | Merge branch 'mesa_7_6_branch' | Brian Paul | 2009-10-08 | 1 | -34/+4 |
|\ \ | | | | | | | | | | | | | | | | Conflicts: src/mesa/drivers/common/meta.c | ||||
| * | | mesa: don't need to free textures, VBOs, etc. in _mesa_meta_free() | Brian Paul | 2009-10-07 | 1 | -28/+4 |
| | | | | | | | | | | | | | | | They're freed by the normal context deallocation code. Fixes Blender crash, bug 24185. | ||||
* | | | meta: Make sure texImage->TexFormat is valid for CopyTex(Sub)Image. | Michel Dänzer | 2009-10-03 | 1 | -0/+7 |
| | | | |||||
* | | | mesa: optimized _mesa_meta_BlitFramebuffer() for src=texture case | Brian Paul | 2009-10-02 | 1 | -0/+130 |
| | | | | | | | | | | | | | | | If the src renderbuffer is actually a texture, we can directly use that texture as the src and avoid a copy. | ||||
* | | | mesa: added _mesa_meta_check_generate_mipmap_fallback() | Brian Paul | 2009-10-02 | 2 | -3/+28 |
| | | | |||||
* | | | meta: Fix invalid PBO access from DrawPixels when trying to just alloc. | Eric Anholt | 2009-09-28 | 1 | -6/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This whole reuse of buffers (TexSubImage instead of TexImage, SubData instead of Data) is bad for hardware drivers, but it's even worse when we accidentally try to access the 2x2 PBO to fill the new 16x16 texture we're creating, producing GL errors. Fixes piglit pbo-drawpixels. Bug #14163. | ||||
* | | | intel: Drop my generatemipmap code in favor of the new shared code. | Eric Anholt | 2009-09-28 | 1 | -1/+1 |
| |/ |/| | |||||
* | | mesa: _mesa_meta_GenerateMipmap() now working | Brian Paul | 2009-09-24 | 1 | -33/+172 |
| | | | | | | | | | | Handles GL_TEXTURE_1D, GL_TEXTURE_2D, GL_TEXTURE_CUBE_MAP. But GL_TEXTURE_3D and texture borders not supported yet. | ||||
* | | Merge branch 'mesa_7_6_branch' | Brian Paul | 2009-09-22 | 1 | -28/+20 |
|\| | |||||
| * | mesa: don't re-use the meta glDrawPixels VBO; create a new one each time | Brian Paul | 2009-09-22 | 1 | -30/+22 |
| | | | | | | | | This should help to work around bugs 24083 and 23670. | ||||
* | | Merge branch 'mesa_7_6_branch' | Brian Paul | 2009-09-20 | 1 | -4/+0 |
|\| | | | | | | | | | Conflicts: src/mesa/drivers/dri/intel/intel_clear.c | ||||
| * | mesa: fix clip plane, fog issues | Brian Paul | 2009-09-16 | 1 | -4/+0 |
| | | |||||
* | | mesa: remove redundant readbuffer check | Brian Paul | 2009-09-19 | 1 | -5/+0 |
| | | |||||
* | | mesa: rename functions to be more consistant with rest of mesa | Brian Paul | 2009-09-19 | 2 | -41/+40 |
| | | |||||
* | | mesa: use new meta functions | Brian Paul | 2009-09-19 | 1 | -4/+4 |
| | | |||||
* | | mesa: meta functions for glCopyColorTable, glCopyConvolutionFilter, etc | Brian Paul | 2009-09-19 | 2 | -0/+141 |
| | | |||||
* | | mesa: fix some glCopyTex[Sub]Image regressions related to convolution | Brian Paul | 2009-09-19 | 1 | -0/+26 |
| | | |||||
* | | mesa: use new _mesa_meta_CopyTex[Sub]Image() functions | Brian Paul | 2009-09-19 | 1 | -5/+6 |
| | | |||||
* | | mesa: meta driver functions for glCopyTex[Sub]Image() | Brian Paul | 2009-09-16 | 2 | -23/+335 |
| | | | | | | | | | | Implement in terms of glReadPixels + glTex[Sub]Image(). This will allow us to get rid of some swrast texture code. | ||||
* | | mesa: remove incorrect texture state check | Brian Paul | 2009-09-15 | 1 | -6/+0 |
| | | | | | | | | | | | | | | Fixes incorrectly textured bitmap text in engine demo. It's incorrect to test the texture enable bits here since they may have been changed by disabling the shader above. Optimization is still possible but will have to be reexamined. | ||||
* | | mesa: nicer vertex setup | Brian Paul | 2009-09-10 | 1 | -128/+138 |
| | | |||||
* | | Merge branch 'mesa_7_6_branch' | Brian Paul | 2009-09-10 | 1 | -0/+9 |
|\| | |||||
| * | mesa: need to set all stencil bits to 0 before setting the 1 bits | Brian Paul | 2009-09-10 | 1 | -0/+9 |
| | | | | | | | | Plus, check for pixel transfer stencil index/offset. | ||||
* | | mesa: fix cut&paste typos | Mathias Frohlich | 2009-09-10 | 1 | -4/+4 |
| | | |||||
* | | Merge branch 'mesa_7_6_branch' | Brian Paul | 2009-09-09 | 1 | -1/+4 |
|\| | |||||
| * | mesa: disable GL_LUMINANCE case in _mesa_meta_draw_pixels() | Brian Paul | 2009-09-09 | 1 | -1/+4 |
| | | | | | | | | Works around a bug found on i965. See bug 23670. | ||||
* | | mesa: initial version of _mesa_meta_generate_mipmap() | Brian Paul | 2009-09-06 | 2 | -4/+182 |
| | | | | | | | | Incomplete and totally untested. Based on intel_generate_mipmap(). | ||||
* | | mesa: use separate temp texture for bitmaps | Brian Paul | 2009-09-06 | 1 | -21/+42 |
| | | |||||
* | | mesa: temp_texture changes | Brian Paul | 2009-09-06 | 1 | -21/+35 |
| | | |||||
* | | mesa: free meta bitmap buffers | Brian Paul | 2009-09-06 | 1 | -0/+4 |
| | |