diff options
| author | Michel Dänzer <[email protected]> | 2009-10-02 18:13:26 +0200 |
|---|---|---|
| committer | Michel Dänzer <[email protected]> | 2009-10-02 18:13:26 +0200 |
| commit | 47e41b024e325f69ed514e551a6824afa58f1db6 (patch) | |
| tree | 5b98f65f5d67e2a1a450ad681bc64bf229a198d2 /src/gallium/state_trackers | |
| parent | 7d4b348c67dbc2eff1d7dd0c043a76bc0eae57ab (diff) | |
gallium: Preparations for adding more PIPE_TRANSFER_* usage flags.
Always test for PIPE_TRANSFER_READ/WRITE using the bit-wise and operator, and
add a pipe_transfer_buffer_flags() helper for getting the buffer usage flags
corresponding to them.
Diffstat (limited to 'src/gallium/state_trackers')
| -rwxr-xr-x | src/gallium/state_trackers/python/retrace/interpreter.py | 2 | ||||
| -rw-r--r-- | src/gallium/state_trackers/vega/st_inlines.h | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/gallium/state_trackers/python/retrace/interpreter.py b/src/gallium/state_trackers/python/retrace/interpreter.py index 6f0bd6ae52a..f4ed2fde4dc 100755 --- a/src/gallium/state_trackers/python/retrace/interpreter.py +++ b/src/gallium/state_trackers/python/retrace/interpreter.py @@ -314,7 +314,7 @@ class Screen(Object): if texture is None: return None transfer = Transfer(texture.get_surface(face, level, zslice), x, y, w, h) - if transfer and usage != gallium.PIPE_TRANSFER_WRITE: + if transfer and usage & gallium.PIPE_TRANSFER_READ if self.interpreter.options.all: self.interpreter.present(transfer.surface, 'transf_read', x, y, w, h) return transfer diff --git a/src/gallium/state_trackers/vega/st_inlines.h b/src/gallium/state_trackers/vega/st_inlines.h index 1f331dfcdb7..610755e0636 100644 --- a/src/gallium/state_trackers/vega/st_inlines.h +++ b/src/gallium/state_trackers/vega/st_inlines.h @@ -57,8 +57,7 @@ st_cond_flush_get_tex_transfer(struct vg_context *st, pipe->is_texture_referenced(pipe, pt, face, level); if (referenced && ((referenced & PIPE_REFERENCED_FOR_WRITE) || - usage == PIPE_TRANSFER_WRITE || - usage == PIPE_TRANSFER_READ_WRITE)) + (usage & PIPE_TRANSFER_WRITE))) vgFlush(); return screen->get_tex_transfer(screen, pt, face, level, zslice, usage, |