Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'mesa_7_6_branch' | Brian Paul | 2009-11-04 | 4 | -178/+179 |
|\ | | | | | | | | | | | Conflicts: src/mesa/drivers/windows/gdi/mesa.def | ||||
| * | mesa: fix broken pack_histogram() case for GLhalf | Brian Paul | 2009-11-04 | 1 | -3/+4 |
| | | |||||
| * | mesa: silence warning from gcc 4.4.1 | Brian Paul | 2009-11-04 | 1 | -2/+2 |
| | | |||||
| * | mesa: (GLint64) casts in get.c to silence Visual Studio warnings | Brian Paul | 2009-11-03 | 2 | -173/+173 |
| | | | | | | | | Revised version of a patch from Karl Schultz. | ||||
| * | mesa: added GLAPIENTRY keywords for sync object functions | Karl Schultz | 2009-11-03 | 2 | -12/+12 |
| | | | | | | | | Signed-off-by: Brian Paul <[email protected]> | ||||
* | | mesa: clean-up, remove some flushing in FBO functions | Brian Paul | 2009-11-03 | 1 | -7/+11 |
| | | | | | | | | | | Remove some unneeded flushes. Replace FLUSH_CURRENT w/ FLUSH_VERTICES in other places. | ||||
* | | mesa: fix indentation | Brian Paul | 2009-11-03 | 1 | -2/+1 |
| | | |||||
* | | mesa: clean-up formatting | Brian Paul | 2009-11-03 | 1 | -1/+1 |
| | | |||||
* | | mesa: avoid extraneous _NEW_BUFFER changes in _mesa_BindFramebufferEXT() | Brian Paul | 2009-11-03 | 1 | -7/+10 |
| | | |||||
* | | mesa: use FLUSH_VERTICES() in _mesa_drawbuffers() | Brian Paul | 2009-11-03 | 1 | -1/+1 |
| | | |||||
* | | mesa: avoid extraneous _NEW_BUFFER state in _mesa_drawbuffers() | Brian Paul | 2009-11-03 | 1 | -9/+29 |
| | | |||||
* | | mesa: use ffs() to shorten loop in _mesa_drawbuffers() | Brian Paul | 2009-11-03 | 1 | -6/+10 |
| | | |||||
* | | mesa: added assertion, another comment | Brian Paul | 2009-11-03 | 1 | -1/+3 |
| | | |||||
* | | mesa: added comment | Brian Paul | 2009-11-02 | 1 | -0/+2 |
| | | |||||
* | | mesa: use _mesa_get_current_tex_object() | Brian Paul | 2009-11-02 | 1 | -13/+4 |
| | | |||||
* | | mesa: make _mesa_get_current_tex_objec() public | Brian Paul | 2009-11-02 | 2 | -31/+33 |
| | | |||||
* | | mesa: fix incorrect approx bits/channel for fxt1 formats | Brian Paul | 2009-11-02 | 1 | -2/+2 |
| | | | | | | | | See bug 24806. | ||||
* | | mesa: better error message | Brian Paul | 2009-10-30 | 1 | -2/+2 |
| | | |||||
* | | mesa: fix inverted buffer object test | Brian Paul | 2009-10-30 | 1 | -1/+1 |
| | | | | | | | | Fixes bug 24799. | ||||
* | | mesa: fix incorrect format info for MESA_FORMAT_SL8 | Brian Paul | 2009-10-30 | 1 | -3/+3 |
| | | | | | | | | Fixes bugs 24798 and 24801. | ||||
* | | mesa: fix _mesa_texstore_argb8888() for MESA_FORMAT_XRGB8888 | Brian Paul | 2009-10-29 | 1 | -1/+1 |
| | | | | | | | | | | | | If we hit the general path and call _mesa_make_temp_chan_image() we always want to get a GL_RGBA texture. We were getting a 3-channel GL_RGB texture before and that messed up the memory layout. | ||||
* | | mesa: lift memcpy_get_tex_image() code from intel driver into core Mesa | Brian Paul | 2009-10-29 | 1 | -1/+83 |
| | | | | | | | | The code should work for any driver. | ||||
* | | mesa: refactor _mesa_get_teximage() code | Brian Paul | 2009-10-29 | 1 | -158/+302 |
| | | | | | | | | Break different formats into different functions to make it easier to read. | ||||
* | | mesa: Add MESA_FORMAT_Z24_X8. | José Fonseca | 2009-10-29 | 4 | -1/+62 |
| | | |||||
* | | mesa: consolidate some code in _mesa_GetCompressedTexImageARB() | Brian Paul | 2009-10-29 | 1 | -6/+2 |
| | | |||||
* | | mesa: move pixels==NULL check in glGetTexImage() | Brian Paul | 2009-10-29 | 1 | -9/+10 |
| | | |||||
* | | mesa: consolidate some code in _mesa_GetTexImage() | Brian Paul | 2009-10-29 | 1 | -6/+2 |
| | | |||||
* | | mesa: move, clean-up _mesa_print_texture() | Brian Paul | 2009-10-29 | 3 | -57/+64 |
| | | |||||
* | | mesa: fix some tests in subtexture_error_check2() | Brian Paul | 2009-10-29 | 1 | -23/+22 |
| | | | | | | | | | | Don't use hard-coded compressed block sizes. Update comments and error strings. | ||||
* | | mesa: remove unneedded is_srgb_teximage() function | Brian Paul | 2009-10-29 | 1 | -24/+2 |
| | | | | | | | | Use _mesa_get_format_color_encoding() function instead. | ||||
* | | glsl: make shader substitution a little better | Brian Paul | 2009-10-29 | 1 | -3/+16 |
| | | |||||
* | | mesa: move declaration to prevent unused var warning | Brian Paul | 2009-10-29 | 1 | -1/+1 |
| | | |||||
* | | mesa: Fix compilation errors and warnings when features are disabled. | Chia-I Wu | 2009-10-29 | 3 | -12/+13 |
| | | | | | | | | | | | | Some of the fixes are cherry-picked from opengl-es branch. Signed-off-by: Chia-I Wu <[email protected]> | ||||
* | | mesa/main: Make FEATURE_texture_s3tc follow feature conventions. | Chia-I Wu | 2009-10-29 | 4 | -9/+39 |
| | | | | | | | | Signed-off-by: Chia-I Wu <[email protected]> | ||||
* | | mesa/main: Make FEATURE_texture_fxt1 follow feature conventions. | Chia-I Wu | 2009-10-29 | 4 | -43/+20 |
| | | | | | | | | | | | | Also remove the unused initialization and GLchan fetch functions. Signed-off-by: Chia-I Wu <[email protected]> | ||||
* | | mesa/main: Never return NULL in _mesa_get_texstore_func. | Chia-I Wu | 2009-10-29 | 1 | -3/+25 |
| | | | | | | | | Signed-off-by: Chia-I Wu <[email protected]> | ||||
* | | mesa: remove old, unused #define | Brian Paul | 2009-10-28 | 1 | -2/+0 |
| | | |||||
* | | mesa: move some gl_texture_image and gl_renderbuffer fields around | Brian Paul | 2009-10-28 | 1 | -3/+5 |
| | | |||||
* | | mesa: minor code movement | Brian Paul | 2009-10-28 | 2 | -36/+33 |
| | | |||||
* | | Merge branch 'texformat-rework' | Brian Paul | 2009-10-28 | 30 | -4105/+3654 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: choose texture format in _mesa_get_fallback_texture() | Brian Paul | 2009-10-28 | 1 | -0/+5 |
| | | | |||||
| * | | mesa: choose texture format in core mesa, not drivers | Brian Paul | 2009-10-25 | 2 | -16/+48 |
| | | | | | | | | | | | | | | | | | | 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 _mesa_compressed_texture_size_glenum() stub | Brian Paul | 2009-10-25 | 1 | -1/+0 |
| | | | |||||
| * | | mesa: remove _mesa_compressed_row_stride() | Brian Paul | 2009-10-25 | 2 | -20/+0 |
| | | | |||||
| * | | mesa: begin removing _mesa_compressed_row_stride() calls | Brian Paul | 2009-10-25 | 2 | -3/+3 |
| | | | | | | | | | | | | Use equivalent _mesa_format_row_stride() function instead. | ||||
| * | | mesa: simplify texture_row_stride() helper | Brian Paul | 2009-10-25 | 1 | -10/+1 |
| | | | |||||
| * | | mesa: fix-up error checking related to compressed texture block size | Brian Paul | 2009-10-25 | 1 | -5/+17 |
| | | | |||||
| * | | mesa: clean-up, simplify compressed texture size checking | Brian Paul | 2009-10-25 | 3 | -51/+36 |
| | | | |||||
| * | | mesa: remove _mesa_compressed_texture_size() | Brian Paul | 2009-10-24 | 4 | -42/+6 |
| | | | | | | | | | | | | Use _mesa_format_image_size() instead. | ||||
| * | | mesa: remove ctx->Driver.CompressedTextureSize() hook | Brian Paul | 2009-10-24 | 1 | -7/+0 |
| | | | | | | | | | | | | It always just called _mesa_compressed_texture_size() anyway. |