diff options
Diffstat (limited to 'src/i830_batchbuffer.h')
| -rw-r--r-- | src/i830_batchbuffer.h | 28 |
1 files changed, 27 insertions, 1 deletions
diff --git a/src/i830_batchbuffer.h b/src/i830_batchbuffer.h index 51382286..5026a72c 100644 --- a/src/i830_batchbuffer.h +++ b/src/i830_batchbuffer.h @@ -32,9 +32,11 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define BATCH_RESERVED 16 + void intel_batch_init(ScrnInfoPtr scrn); void intel_batch_teardown(ScrnInfoPtr scrn); -void intel_batch_flush(ScrnInfoPtr scrn, Bool flushed); +void intel_batch_pipelined_flush(ScrnInfoPtr scrn); +void intel_batch_flush(ScrnInfoPtr scrn, Bool flush); void intel_batch_wait_last(ScrnInfoPtr scrn); static inline int intel_batch_space(intel_screen_private *intel) @@ -93,6 +95,27 @@ intel_batch_emit_reloc(intel_screen_private *intel, } static inline void +intel_batch_mark_pixmap_domains(intel_screen_private *intel, + struct intel_pixmap *priv, + uint32_t read_domains, uint32_t write_domain) +{ + assert (read_domains); + assert (write_domain == 0 || write_domain == read_domains); + assert (write_domain == 0 || + priv->flush_write_domain == 0 || + priv->flush_write_domain == write_domain); + + priv->flush_read_domains |= read_domains; + priv->batch_read_domains |= read_domains; + priv->flush_write_domain |= write_domain; + priv->batch_write_domain |= write_domain; + if (list_is_empty(&priv->batch)) + list_add(&priv->batch, &intel->batch_pixmaps); + if (list_is_empty(&priv->flush)) + list_add(&priv->flush, &intel->flush_pixmaps); +} + +static inline void intel_batch_emit_reloc_pixmap(intel_screen_private *intel, PixmapPtr pixmap, uint32_t read_domains, uint32_t write_domain, uint32_t delta) @@ -102,6 +125,9 @@ intel_batch_emit_reloc_pixmap(intel_screen_private *intel, PixmapPtr pixmap, assert(intel->batch_ptr != NULL); assert(intel_batch_space(intel) >= 4); if (bo) { + struct intel_pixmap *priv = i830_get_pixmap_intel(pixmap); + intel_batch_mark_pixmap_domains(intel, priv, read_domains, + write_domain); intel_batch_emit_reloc(intel, bo, read_domains, write_domain, delta); return; |