Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | glsl: make shader substitution a little better | Brian Paul | 2009-10-29 | 1 | -3/+16 |
| | |||||
* | st/mesa: fix PIPE_FORMAT_X8Z24 <> MESA_FORMAT_X8_Z24 conversion | David Heidelberger | 2009-10-29 | 1 | -0/+2 |
| | | | | | Signed-off-by: David Heidelberger <[email protected]> Signed-off-by: Brian Paul <[email protected]> | ||||
* | st/mesa: Add conversion from PIPE_FORMAT_X8Z24_UNORM to MESA_FORMAT_S8_Z24. | David Heidelberger | 2009-10-29 | 1 | -0/+2 |
| | | | | | | | Fix glxgears and openarena for Nouveau (no more asserts and crash). Signed-off-by: David Heidelberger <[email protected] Signed-off-by: Brian Paul <[email protected]> | ||||
* | st/mesa: Fix nouveau glxinfo after merging texformat-rework. | David Heidelberger | 2009-10-29 | 1 | -0/+6 |
| | | | | | Signed-off-by: David Heidelberger <[email protected]> Signed-off-by: Brian Paul <[email protected]> | ||||
* | 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 | 4 | -12/+15 |
| | | | | | | 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]> | ||||
* | radeon: fix incorrect Z format in radeon_alloc_renderbuffer_storage() | Brian Paul | 2009-10-29 | 1 | -2/+2 |
| | | | | And update error message. | ||||
* | swrast: added braces | Chia-I Wu | 2009-10-28 | 1 | -2/+4 |
| | |||||
* | mesa: remove old, unused #define | Brian Paul | 2009-10-28 | 1 | -2/+0 |
| | |||||
* | mesa: re-remove s3v and trident driver files | Brian Paul | 2009-10-28 | 3 | -1350/+0 |
| | | | | | These were removed from master but a few files came back from the texformat-rework branch. | ||||
* | 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 | 137 | -5767/+6514 |
|\ | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | swrast: fix RGB, RGBA texturing code | Brian Paul | 2009-10-28 | 1 | -5/+11 |
| | | | | | | | | | | | | Fix backward component ordering for RGB textures. Only optimize RGBA texture case if running little endian. This restriction could be lifted with a little work. | ||||
| * | swrast: check for single texture unit in _swrast_choose_triangle() | Brian Paul | 2009-10-28 | 1 | -0/+1 |
| | | |||||
| * | swrast: clean up and remove dead code in triangle functions | Brian Paul | 2009-10-28 | 1 | -57/+47 |
| | | |||||
| * | swrast: fix texel decoding in opt_sample_rgba_2d() | Brian Paul | 2009-10-28 | 1 | -5/+5 |
| | | |||||
| * | mesa: choose texture format in _mesa_get_fallback_texture() | Brian Paul | 2009-10-28 | 1 | -0/+5 |
| | | |||||
| * | 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 | 12 | -64/+54 |
| | | | | | | | | | | | | 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: remove calls to _mesa_compressed_row_stride() | Brian Paul | 2009-10-25 | 5 | -15/+15 |
| | | |||||
| * | glide: remove _mesa_compressed_row_stride() calls | Brian Paul | 2009-10-25 | 1 | -11/+9 |
| | | | | | | | | And fix incorrect first parameter. | ||||
| * | mesa: remove _mesa_compressed_row_stride() calls | Brian Paul | 2009-10-25 | 1 | -2/+1 |
| | | |||||
| * | 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 | 6 | -53/+13 |
| | | | | | | | | Use _mesa_format_image_size() instead. | ||||
| * | mesa: remove ctx->Driver.CompressedTextureSize() hook | Brian Paul | 2009-10-24 | 3 | -9/+0 |
| | | | | | | | | It always just called _mesa_compressed_texture_size() anyway. | ||||
| * | mesa: change compressed texture size calls | Brian Paul | 2009-10-24 | 6 | -41/+23 |
| | | | | | | | | | | Replace calls to ctx->Driver.CompressedTextureSize with calls to _mesa_format_image_size. The former always called the later. | ||||
| * | mesa: minor clean-ups in _mesa_store_compressed_texsubimage2d() | Brian Paul | 2009-10-24 | 1 | -4/+5 |
| | | |||||
| * | mesa: simplify _mesa_compressed_row_stride(), _mesa_compressed_image_address() | Brian Paul | 2009-10-24 | 1 | -76/+15 |
| | | | | | | | | | | _mesa_compressed_row_stride() can go away soon. _mesa_compressed_image_address() can be generalized and moved to formats.c | ||||
| * | mesa: s/GLuint/gl_format/ | Brian Paul | 2009-10-24 | 2 | -6/+7 |
| | | |||||
| * | mesa: move assertion after declaration | Brian Paul | 2009-10-24 | 1 | -1/+1 |
| | | |||||
| * | mesa: remove hard-coded block sizes | Brian Paul | 2009-10-24 | 1 | -5/+9 |
| | | |||||
| * | mesa: added _mesa_get_format_block_size() | Brian Paul | 2009-10-24 | 2 | -0/+19 |
| | | |||||
| * | mesa: added _mesa_get_format_name() | Brian Paul | 2009-10-24 | 2 | -0/+78 |
| | | |||||
| * | mesa: additional comments in format code | Brian Paul | 2009-10-24 | 1 | -1/+28 |
| | | |||||
| * | dri/drivers: update driNewRenderbuffer() to take a gl_format | Brian Paul | 2009-10-22 | 20 | -145/+136 |
| | | | | | | | | | | | | | | | | Now pass a specific MESA_FORMAT_x token to indicate the renderbuffer's format. This is better than passing a GLenum and having to guess the specific format. I'm unable to test all the drivers, but any issues should be easy to fix. | ||||
| * | radeon: simplify radeon_create_renderbuffer() | Brian Paul | 2009-10-22 | 3 | -29/+27 |
| | | |||||
| * | r600: fix depth span macros for format changes | Alex Deucher | 2009-10-22 | 1 | -4/+4 |
| | | |||||
| * | radeon: fix some renderbuffer format bugs | Brian Paul | 2009-10-22 | 2 | -7/+7 |
| | | |||||
| * | i915: replace MESA_FORMAT_Z24_S8 with MESA_FORMAT_S8_Z24 | Brian Paul | 2009-10-21 | 1 | -2/+2 |
| | | | | | | | | And change parameter type. | ||||
| * | radeon: get rid of z24s8 <-> s8z24 conversions in span code | Brian Paul | 2009-10-21 | 1 | -26/+8 |
| | | | | | | | | | | Can just use s8z24 everywhere. Note: the WRITE_DEPTH macro for R600 may need to be fixed. | ||||
| * | radeon: replace MESA_FORMAT_Z24_S8 with MESA_FORMAT_S8_Z24 | Brian Paul | 2009-10-21 | 3 | -6/+6 |
| | | | | | | | | | | Core Mesa deals with MESA_FORMAT_S8_Z24 everywhere it should so we shouldn't have to use MESA_FORMAT_Z24_S8 anymore. |