[//cc] Convert SI RASTER usage to RASTER_READ | RASTER_WRITE
There are no functional changes, as RASTER is a constant that expands
to RASTER_READ | RASTER_WRITE.
Bug: 1519074
Change-Id: Ice218ad2e99a83ca9467f0291334695992833bce
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5204505
Reviewed-by: Vasiliy Telezhnikov <vasilyt@chromium.org>
Commit-Queue: Colin Blundell <blundell@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1248197}
diff --git a/cc/layers/heads_up_display_layer_impl.cc b/cc/layers/heads_up_display_layer_impl.cc
index c1e2732..60d4672 100644
--- a/cc/layers/heads_up_display_layer_impl.cc
+++ b/cc/layers/heads_up_display_layer_impl.cc
@@ -312,8 +312,9 @@
backing->overlay_candidate = raster_caps.tile_overlay_candidate;
backing->texture_target = raster_caps.tile_texture_target;
- uint32_t flags =
- gpu::SHARED_IMAGE_USAGE_DISPLAY_READ | gpu::SHARED_IMAGE_USAGE_RASTER;
+ uint32_t flags = gpu::SHARED_IMAGE_USAGE_DISPLAY_READ |
+ gpu::SHARED_IMAGE_USAGE_RASTER_READ |
+ gpu::SHARED_IMAGE_USAGE_RASTER_WRITE;
if (raster_caps.use_gpu_rasterization) {
flags |= gpu::SHARED_IMAGE_USAGE_OOP_RASTERIZATION;
}
diff --git a/cc/paint/oop_pixeltest.cc b/cc/paint/oop_pixeltest.cc
index 0c1ee57..5247c9b 100644
--- a/cc/paint/oop_pixeltest.cc
+++ b/cc/paint/oop_pixeltest.cc
@@ -187,7 +187,8 @@
// Create and allocate a shared image on the raster interface.
auto* ri = raster_context_provider_->RasterInterface();
auto* sii = raster_context_provider_->SharedImageInterface();
- uint32_t flags = gpu::SHARED_IMAGE_USAGE_RASTER |
+ uint32_t flags = gpu::SHARED_IMAGE_USAGE_RASTER_READ |
+ gpu::SHARED_IMAGE_USAGE_RASTER_WRITE |
gpu::SHARED_IMAGE_USAGE_OOP_RASTERIZATION;
auto client_shared_image = sii->CreateSharedImage(
viz::SinglePlaneFormat::kRGBA_8888, gfx::Size(width, height),
@@ -268,7 +269,8 @@
const RasterOptions& options,
viz::SharedImageFormat image_format,
std::optional<gfx::ColorSpace> color_space = std::nullopt) {
- uint32_t flags = gpu::SHARED_IMAGE_USAGE_RASTER |
+ uint32_t flags = gpu::SHARED_IMAGE_USAGE_RASTER_READ |
+ gpu::SHARED_IMAGE_USAGE_RASTER_WRITE |
gpu::SHARED_IMAGE_USAGE_OOP_RASTERIZATION;
auto client_shared_image = sii->CreateSharedImage(
image_format, options.resource_size,
diff --git a/cc/raster/gpu_raster_buffer_provider.cc b/cc/raster/gpu_raster_buffer_provider.cc
index bb7c7a7..82fb7a7 100644
--- a/cc/raster/gpu_raster_buffer_provider.cc
+++ b/cc/raster/gpu_raster_buffer_provider.cc
@@ -374,7 +374,8 @@
DCHECK(!backing_->returned_sync_token.HasData());
auto* sii = client_->worker_context_provider_->SharedImageInterface();
uint32_t flags = gpu::SHARED_IMAGE_USAGE_DISPLAY_READ |
- gpu::SHARED_IMAGE_USAGE_RASTER |
+ gpu::SHARED_IMAGE_USAGE_RASTER_READ |
+ gpu::SHARED_IMAGE_USAGE_RASTER_WRITE |
gpu::SHARED_IMAGE_USAGE_OOP_RASTERIZATION;
if (backing_->overlay_candidate) {
flags |= gpu::SHARED_IMAGE_USAGE_SCANOUT;
diff --git a/cc/raster/one_copy_raster_buffer_provider.cc b/cc/raster/one_copy_raster_buffer_provider.cc
index f5a1cb2..4e230df 100644
--- a/cc/raster/one_copy_raster_buffer_provider.cc
+++ b/cc/raster/one_copy_raster_buffer_provider.cc
@@ -457,8 +457,9 @@
bool needs_clear = false;
if (!shared_image) {
- uint32_t usage =
- gpu::SHARED_IMAGE_USAGE_DISPLAY_READ | gpu::SHARED_IMAGE_USAGE_RASTER;
+ uint32_t usage = gpu::SHARED_IMAGE_USAGE_DISPLAY_READ |
+ gpu::SHARED_IMAGE_USAGE_RASTER_READ |
+ gpu::SHARED_IMAGE_USAGE_RASTER_WRITE;
if (mailbox_texture_is_overlay_candidate)
usage |= gpu::SHARED_IMAGE_USAGE_SCANOUT;
shared_image = sii->CreateSharedImage(