diff options
| author | Chia-I Wu <olv@lunarg.com> | 2010-05-07 17:34:15 +0800 |
|---|---|---|
| committer | Chia-I Wu <olv@lunarg.com> | 2010-05-09 16:23:28 +0800 |
| commit | 913d7c388d1167a6cb3ccb52eb50f4c4f183b033 (patch) | |
| tree | b6c02c24fd8b553823025565087539ad09ef8c41 /src | |
| parent | 8ad3e0b55df50beac8ba3c5cafa0be79641a4977 (diff) | |
| download | external_mesa3d-913d7c388d1167a6cb3ccb52eb50f4c4f183b033.zip external_mesa3d-913d7c388d1167a6cb3ccb52eb50f4c4f183b033.tar.gz external_mesa3d-913d7c388d1167a6cb3ccb52eb50f4c4f183b033.tar.bz2 | |
st/mesa: Ignore internal_format in st_context_teximage.
When internal_format and tex->format differ, st_finailize_texture will
surface_copy between surfaces with different formats. This commit works
around the issue by ignoring internal_format. A sane fix is needed
here.
Diffstat (limited to 'src')
| -rw-r--r-- | src/mesa/state_tracker/st_manager.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/mesa/state_tracker/st_manager.c b/src/mesa/state_tracker/st_manager.c index ea89553..8691969 100644 --- a/src/mesa/state_tracker/st_manager.c +++ b/src/mesa/state_tracker/st_manager.c @@ -541,7 +541,16 @@ st_context_teximage(struct st_context_iface *stctxi, enum st_texture_type target texImage = _mesa_get_tex_image(ctx, texObj, target, level); stImage = st_texture_image(texImage); if (tex) { - if (util_format_get_component_bits(internal_format, + /* + * XXX When internal_format and tex->format differ, st_finalize_texture + * needs to allocate a new texture with internal_format and copy the + * texture here into the new one. It will result in surface_copy being + * called on surfaces whose formats differ. + * + * To avoid that, internal_format is (wrongly) ignored here. A sane fix + * is to use a sampler view. + */ + if (util_format_get_component_bits(tex->format, UTIL_FORMAT_COLORSPACE_RGB, 3) > 0) internalFormat = GL_RGBA; else |