diff options
| author | Marek Olšák <maraeo@gmail.com> | 2011-12-29 18:18:38 +0100 |
|---|---|---|
| committer | Marek Olšák <maraeo@gmail.com> | 2012-01-01 11:47:05 +0100 |
| commit | ce9d61fec64138ebf8d0bec2511e66593297b7d5 (patch) | |
| tree | 3e60c2743b8df17392415e7d22b0e10446343624 /src/gallium/drivers/r300/r300_texture_desc.h | |
| parent | ce31970af16558ebd60cfae33c000252bc3e1cbf (diff) | |
| download | external_mesa3d-ce9d61fec64138ebf8d0bec2511e66593297b7d5.zip external_mesa3d-ce9d61fec64138ebf8d0bec2511e66593297b7d5.tar.gz external_mesa3d-ce9d61fec64138ebf8d0bec2511e66593297b7d5.tar.bz2 | |
r300g: rework resource_copy_region, not changing pipe_resource
Changing pipe_resource was wrong, because it can be used by other contexts
at the same time. This fixes the last possible race condition in r300g
that I know of.
This also fixes blitting NPOT compressed textures. Random pixels sometimes
appeared at the right-hand edge of the texture.
Finally, this removes r300_texture_desc::stride_in_pixels. It makes little
sense with sampler views and surfaces being able to override width0, height0,
and the format entirely.
Diffstat (limited to 'src/gallium/drivers/r300/r300_texture_desc.h')
| -rw-r--r-- | src/gallium/drivers/r300/r300_texture_desc.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/gallium/drivers/r300/r300_texture_desc.h b/src/gallium/drivers/r300/r300_texture_desc.h index 591592d..dd2a07e 100644 --- a/src/gallium/drivers/r300/r300_texture_desc.h +++ b/src/gallium/drivers/r300/r300_texture_desc.h @@ -50,4 +50,7 @@ void r300_texture_desc_init(struct r300_screen *rscreen, unsigned r300_texture_get_offset(struct r300_resource *tex, unsigned level, unsigned layer); +unsigned r300_stride_to_width(enum pipe_format format, + unsigned stride_in_bytes); + #endif |