mirror of
https://github.com/encounter/dawn-cmake.git
synced 2025-12-16 16:37:08 +00:00
Remove wgpu::BindGroupLayoutEntry::textureDimension
It was deprecated in favor of viewDimension. Bug: dawn:22 Change-Id: I8016d7440d98cc69acd1b48cb76f7ae1c1353896 Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/21681 Commit-Queue: Corentin Wallez <cwallez@chromium.org> Reviewed-by: Stephen White <senorblanco@chromium.org> Reviewed-by: Austin Eng <enga@chromium.org>
This commit is contained in:
Corentin Wallez
committed by
Commit Bot service account
Commit Bot service account
parent
84ae2bfe3b
commit
b761fe1346
@@ -864,12 +864,12 @@ namespace {
|
||||
|
||||
// Create a bind group to use the texture as sampled and readonly storage bindings
|
||||
wgpu::BindGroupLayout bgl = utils::MakeBindGroupLayout(
|
||||
device, {{0, wgpu::ShaderStage::Fragment | wgpu::ShaderStage::Compute,
|
||||
wgpu::BindingType::SampledTexture},
|
||||
{1, wgpu::ShaderStage::Fragment | wgpu::ShaderStage::Compute,
|
||||
wgpu::BindingType::ReadonlyStorageTexture, false, false,
|
||||
wgpu::TextureViewDimension::Undefined, wgpu::TextureViewDimension::Undefined,
|
||||
wgpu::TextureComponentType::Float, kFormat}});
|
||||
device,
|
||||
{{0, wgpu::ShaderStage::Fragment | wgpu::ShaderStage::Compute,
|
||||
wgpu::BindingType::SampledTexture},
|
||||
{1, wgpu::ShaderStage::Fragment | wgpu::ShaderStage::Compute,
|
||||
wgpu::BindingType::ReadonlyStorageTexture, false, false,
|
||||
wgpu::TextureViewDimension::Undefined, wgpu::TextureComponentType::Float, kFormat}});
|
||||
wgpu::BindGroup bg = utils::MakeBindGroup(device, bgl, {{0, view}, {1, view}});
|
||||
|
||||
// Test render pass
|
||||
@@ -932,8 +932,7 @@ namespace {
|
||||
device, {{0, wgpu::ShaderStage::Compute, wgpu::BindingType::SampledTexture},
|
||||
{1, wgpu::ShaderStage::Compute, wgpu::BindingType::WriteonlyStorageTexture,
|
||||
false, false, wgpu::TextureViewDimension::Undefined,
|
||||
wgpu::TextureViewDimension::Undefined, wgpu::TextureComponentType::Float,
|
||||
kFormat}});
|
||||
wgpu::TextureComponentType::Float, kFormat}});
|
||||
wgpu::BindGroup bg = utils::MakeBindGroup(device, bgl, {{0, view}, {1, view}});
|
||||
|
||||
// Create a no-op compute pipeline
|
||||
@@ -978,8 +977,7 @@ namespace {
|
||||
wgpu::BindGroupLayout bgl = utils::MakeBindGroupLayout(
|
||||
device,
|
||||
{{0, wgpu::ShaderStage::Fragment, wgpu::BindingType::WriteonlyStorageTexture, false,
|
||||
false, wgpu::TextureViewDimension::Undefined,
|
||||
wgpu::TextureViewDimension::Undefined, wgpu::TextureComponentType::Float,
|
||||
false, wgpu::TextureViewDimension::Undefined, wgpu::TextureComponentType::Float,
|
||||
kFormat}});
|
||||
wgpu::BindGroup bg = utils::MakeBindGroup(device, bgl, {{0, view}});
|
||||
|
||||
@@ -1020,12 +1018,10 @@ namespace {
|
||||
wgpu::BindGroupLayout bgl = utils::MakeBindGroupLayout(
|
||||
device, {{0, wgpu::ShaderStage::Compute, wgpu::BindingType::WriteonlyStorageTexture,
|
||||
false, false, wgpu::TextureViewDimension::Undefined,
|
||||
wgpu::TextureViewDimension::Undefined, wgpu::TextureComponentType::Float,
|
||||
kFormat},
|
||||
wgpu::TextureComponentType::Float, kFormat},
|
||||
{1, wgpu::ShaderStage::Compute, wgpu::BindingType::WriteonlyStorageTexture,
|
||||
false, false, wgpu::TextureViewDimension::Undefined,
|
||||
wgpu::TextureViewDimension::Undefined, wgpu::TextureComponentType::Float,
|
||||
kFormat}});
|
||||
wgpu::TextureComponentType::Float, kFormat}});
|
||||
wgpu::BindGroup bg = utils::MakeBindGroup(device, bgl, {{0, view}, {1, view}});
|
||||
|
||||
// Create a no-op compute pipeline
|
||||
@@ -1104,13 +1100,11 @@ namespace {
|
||||
wgpu::BindGroupLayout readBGL = utils::MakeBindGroupLayout(
|
||||
device, {{0, wgpu::ShaderStage::Compute, wgpu::BindingType::ReadonlyStorageTexture,
|
||||
false, false, wgpu::TextureViewDimension::Undefined,
|
||||
wgpu::TextureViewDimension::Undefined, wgpu::TextureComponentType::Float,
|
||||
kFormat}});
|
||||
wgpu::TextureComponentType::Float, kFormat}});
|
||||
wgpu::BindGroupLayout writeBGL = utils::MakeBindGroupLayout(
|
||||
device, {{0, wgpu::ShaderStage::Compute, wgpu::BindingType::WriteonlyStorageTexture,
|
||||
false, false, wgpu::TextureViewDimension::Undefined,
|
||||
wgpu::TextureViewDimension::Undefined, wgpu::TextureComponentType::Float,
|
||||
kFormat}});
|
||||
wgpu::TextureComponentType::Float, kFormat}});
|
||||
wgpu::BindGroup readBG = utils::MakeBindGroup(device, readBGL, {{0, view}});
|
||||
wgpu::BindGroup writeBG = utils::MakeBindGroup(device, writeBGL, {{0, view}});
|
||||
|
||||
@@ -1138,13 +1132,11 @@ namespace {
|
||||
wgpu::BindGroupLayout writeBGL = utils::MakeBindGroupLayout(
|
||||
device, {{0, wgpu::ShaderStage::Compute, wgpu::BindingType::WriteonlyStorageTexture,
|
||||
false, false, wgpu::TextureViewDimension::Undefined,
|
||||
wgpu::TextureViewDimension::Undefined, wgpu::TextureComponentType::Float,
|
||||
kFormat}});
|
||||
wgpu::TextureComponentType::Float, kFormat}});
|
||||
wgpu::BindGroupLayout readBGL = utils::MakeBindGroupLayout(
|
||||
device, {{0, wgpu::ShaderStage::Fragment, wgpu::BindingType::ReadonlyStorageTexture,
|
||||
false, false, wgpu::TextureViewDimension::Undefined,
|
||||
wgpu::TextureViewDimension::Undefined, wgpu::TextureComponentType::Float,
|
||||
kFormat}});
|
||||
wgpu::TextureComponentType::Float, kFormat}});
|
||||
wgpu::BindGroup writeBG = utils::MakeBindGroup(device, writeBGL, {{0, view}});
|
||||
wgpu::BindGroup readBG = utils::MakeBindGroup(device, readBGL, {{0, view}});
|
||||
|
||||
@@ -1182,8 +1174,7 @@ namespace {
|
||||
wgpu::BindGroupLayout writeBGL = utils::MakeBindGroupLayout(
|
||||
device,
|
||||
{{0, wgpu::ShaderStage::Fragment, wgpu::BindingType::WriteonlyStorageTexture, false,
|
||||
false, wgpu::TextureViewDimension::Undefined,
|
||||
wgpu::TextureViewDimension::Undefined, wgpu::TextureComponentType::Float,
|
||||
false, wgpu::TextureViewDimension::Undefined, wgpu::TextureComponentType::Float,
|
||||
kFormat}});
|
||||
wgpu::BindGroup sampledBG = utils::MakeBindGroup(device, sampledBGL, {{0, view}});
|
||||
wgpu::BindGroup writeBG = utils::MakeBindGroup(device, writeBGL, {{0, view}});
|
||||
@@ -1214,13 +1205,11 @@ namespace {
|
||||
wgpu::BindGroupLayout readBGL = utils::MakeBindGroupLayout(
|
||||
device, {{0, wgpu::ShaderStage::Compute, wgpu::BindingType::ReadonlyStorageTexture,
|
||||
false, false, wgpu::TextureViewDimension::Undefined,
|
||||
wgpu::TextureViewDimension::Undefined, wgpu::TextureComponentType::Float,
|
||||
kFormat}});
|
||||
wgpu::TextureComponentType::Float, kFormat}});
|
||||
wgpu::BindGroupLayout writeBGL = utils::MakeBindGroupLayout(
|
||||
device, {{0, wgpu::ShaderStage::Compute, wgpu::BindingType::WriteonlyStorageTexture,
|
||||
false, false, wgpu::TextureViewDimension::Undefined,
|
||||
wgpu::TextureViewDimension::Undefined, wgpu::TextureComponentType::Float,
|
||||
kFormat}});
|
||||
wgpu::TextureComponentType::Float, kFormat}});
|
||||
wgpu::BindGroup readBG = utils::MakeBindGroup(device, readBGL, {{0, view}});
|
||||
wgpu::BindGroup writeBG = utils::MakeBindGroup(device, writeBGL, {{0, view}});
|
||||
|
||||
@@ -1260,8 +1249,7 @@ namespace {
|
||||
wgpu::BindGroupLayout writeBGL = utils::MakeBindGroupLayout(
|
||||
device,
|
||||
{{0, wgpu::ShaderStage::Fragment, wgpu::BindingType::WriteonlyStorageTexture, false,
|
||||
false, wgpu::TextureViewDimension::Undefined,
|
||||
wgpu::TextureViewDimension::Undefined, wgpu::TextureComponentType::Float,
|
||||
false, wgpu::TextureViewDimension::Undefined, wgpu::TextureComponentType::Float,
|
||||
kFormat}});
|
||||
wgpu::BindGroup sampledBG = utils::MakeBindGroup(device, sampledBGL, {{0, view}});
|
||||
wgpu::BindGroup writeBG = utils::MakeBindGroup(device, writeBGL, {{0, view}});
|
||||
@@ -1290,13 +1278,11 @@ namespace {
|
||||
wgpu::BindGroupLayout readBGL = utils::MakeBindGroupLayout(
|
||||
device, {{0, wgpu::ShaderStage::Compute, wgpu::BindingType::ReadonlyStorageTexture,
|
||||
false, false, wgpu::TextureViewDimension::Undefined,
|
||||
wgpu::TextureViewDimension::Undefined, wgpu::TextureComponentType::Float,
|
||||
kFormat}});
|
||||
wgpu::TextureComponentType::Float, kFormat}});
|
||||
wgpu::BindGroupLayout writeBGL = utils::MakeBindGroupLayout(
|
||||
device, {{0, wgpu::ShaderStage::Compute, wgpu::BindingType::WriteonlyStorageTexture,
|
||||
false, false, wgpu::TextureViewDimension::Undefined,
|
||||
wgpu::TextureViewDimension::Undefined, wgpu::TextureComponentType::Float,
|
||||
kFormat}});
|
||||
wgpu::TextureComponentType::Float, kFormat}});
|
||||
wgpu::BindGroup readBG = utils::MakeBindGroup(device, readBGL, {{0, view}});
|
||||
wgpu::BindGroup writeBG = utils::MakeBindGroup(device, writeBGL, {{0, view}});
|
||||
|
||||
@@ -1419,14 +1405,12 @@ namespace {
|
||||
wgpu::BindGroupLayout writeBGL = utils::MakeBindGroupLayout(
|
||||
device, {{0, wgpu::ShaderStage::Compute, wgpu::BindingType::WriteonlyStorageTexture,
|
||||
false, false, wgpu::TextureViewDimension::Undefined,
|
||||
wgpu::TextureViewDimension::Undefined, wgpu::TextureComponentType::Float,
|
||||
kFormat}});
|
||||
wgpu::TextureComponentType::Float, kFormat}});
|
||||
|
||||
wgpu::BindGroupLayout readBGL = utils::MakeBindGroupLayout(
|
||||
device, {{0, wgpu::ShaderStage::Compute, wgpu::BindingType::ReadonlyStorageTexture,
|
||||
false, false, wgpu::TextureViewDimension::Undefined,
|
||||
wgpu::TextureViewDimension::Undefined, wgpu::TextureComponentType::Float,
|
||||
kFormat}});
|
||||
wgpu::TextureComponentType::Float, kFormat}});
|
||||
|
||||
wgpu::BindGroup writeBG0 = utils::MakeBindGroup(device, writeBGL, {{0, view0}});
|
||||
wgpu::BindGroup readBG0 = utils::MakeBindGroup(device, readBGL, {{0, view0}});
|
||||
@@ -1484,12 +1468,10 @@ namespace {
|
||||
wgpu::BindGroupLayout bgl = utils::MakeBindGroupLayout(
|
||||
device, {{0, wgpu::ShaderStage::Compute, wgpu::BindingType::ReadonlyStorageTexture,
|
||||
false, false, wgpu::TextureViewDimension::Undefined,
|
||||
wgpu::TextureViewDimension::Undefined, wgpu::TextureComponentType::Float,
|
||||
kFormat},
|
||||
wgpu::TextureComponentType::Float, kFormat},
|
||||
{1, wgpu::ShaderStage::None, wgpu::BindingType::WriteonlyStorageTexture,
|
||||
false, false, wgpu::TextureViewDimension::Undefined,
|
||||
wgpu::TextureViewDimension::Undefined, wgpu::TextureComponentType::Float,
|
||||
kFormat}});
|
||||
wgpu::TextureComponentType::Float, kFormat}});
|
||||
wgpu::BindGroup bg = utils::MakeBindGroup(device, bgl, {{0, view}, {1, view}});
|
||||
|
||||
// These two bindings are invisible in render pass. But we still track these bindings.
|
||||
@@ -1508,12 +1490,10 @@ namespace {
|
||||
wgpu::BindGroupLayout bgl = utils::MakeBindGroupLayout(
|
||||
device, {{0, wgpu::ShaderStage::Fragment, wgpu::BindingType::ReadonlyStorageTexture,
|
||||
false, false, wgpu::TextureViewDimension::Undefined,
|
||||
wgpu::TextureViewDimension::Undefined, wgpu::TextureComponentType::Float,
|
||||
kFormat},
|
||||
wgpu::TextureComponentType::Float, kFormat},
|
||||
{1, wgpu::ShaderStage::None, wgpu::BindingType::WriteonlyStorageTexture,
|
||||
false, false, wgpu::TextureViewDimension::Undefined,
|
||||
wgpu::TextureViewDimension::Undefined, wgpu::TextureComponentType::Float,
|
||||
kFormat}});
|
||||
wgpu::TextureComponentType::Float, kFormat}});
|
||||
wgpu::BindGroup bg = utils::MakeBindGroup(device, bgl, {{0, view}, {1, view}});
|
||||
|
||||
// Create a no-op compute pipeline.
|
||||
@@ -1549,8 +1529,7 @@ namespace {
|
||||
wgpu::BindGroupLayout bgl = utils::MakeBindGroupLayout(
|
||||
device, {{0, wgpu::ShaderStage::Compute, wgpu::BindingType::ReadonlyStorageTexture,
|
||||
false, false, wgpu::TextureViewDimension::Undefined,
|
||||
wgpu::TextureViewDimension::Undefined, wgpu::TextureComponentType::Float,
|
||||
kFormat}});
|
||||
wgpu::TextureComponentType::Float, kFormat}});
|
||||
wgpu::BindGroup bg = utils::MakeBindGroup(device, bgl, {{0, view}});
|
||||
|
||||
// Texture usage in compute stage in bind group conflicts with render target. And
|
||||
@@ -1569,12 +1548,10 @@ namespace {
|
||||
wgpu::BindGroupLayout bgl = utils::MakeBindGroupLayout(
|
||||
device, {{0, wgpu::ShaderStage::Fragment, wgpu::BindingType::ReadonlyStorageTexture,
|
||||
false, false, wgpu::TextureViewDimension::Undefined,
|
||||
wgpu::TextureViewDimension::Undefined, wgpu::TextureComponentType::Float,
|
||||
kFormat},
|
||||
wgpu::TextureComponentType::Float, kFormat},
|
||||
{1, wgpu::ShaderStage::Compute, wgpu::BindingType::WriteonlyStorageTexture,
|
||||
false, false, wgpu::TextureViewDimension::Undefined,
|
||||
wgpu::TextureViewDimension::Undefined, wgpu::TextureComponentType::Float,
|
||||
kFormat}});
|
||||
wgpu::TextureComponentType::Float, kFormat}});
|
||||
wgpu::BindGroup bg = utils::MakeBindGroup(device, bgl, {{0, view}, {1, view}});
|
||||
|
||||
// Create a no-op compute pipeline.
|
||||
@@ -1604,15 +1581,15 @@ namespace {
|
||||
|
||||
// Create bind groups.
|
||||
wgpu::BindGroupLayout readBGL = utils::MakeBindGroupLayout(
|
||||
device, {{0, wgpu::ShaderStage::Fragment | wgpu::ShaderStage::Compute,
|
||||
wgpu::BindingType::ReadonlyStorageTexture, false, false,
|
||||
wgpu::TextureViewDimension::Undefined, wgpu::TextureViewDimension::Undefined,
|
||||
wgpu::TextureComponentType::Float, kFormat}});
|
||||
device,
|
||||
{{0, wgpu::ShaderStage::Fragment | wgpu::ShaderStage::Compute,
|
||||
wgpu::BindingType::ReadonlyStorageTexture, false, false,
|
||||
wgpu::TextureViewDimension::Undefined, wgpu::TextureComponentType::Float, kFormat}});
|
||||
wgpu::BindGroupLayout writeBGL = utils::MakeBindGroupLayout(
|
||||
device, {{0, wgpu::ShaderStage::Fragment | wgpu::ShaderStage::Compute,
|
||||
wgpu::BindingType::WriteonlyStorageTexture, false, false,
|
||||
wgpu::TextureViewDimension::Undefined, wgpu::TextureViewDimension::Undefined,
|
||||
wgpu::TextureComponentType::Float, kFormat}});
|
||||
device,
|
||||
{{0, wgpu::ShaderStage::Fragment | wgpu::ShaderStage::Compute,
|
||||
wgpu::BindingType::WriteonlyStorageTexture, false, false,
|
||||
wgpu::TextureViewDimension::Undefined, wgpu::TextureComponentType::Float, kFormat}});
|
||||
wgpu::BindGroup readBG = utils::MakeBindGroup(device, readBGL, {{0, view}});
|
||||
wgpu::BindGroup writeBG = utils::MakeBindGroup(device, writeBGL, {{0, view}});
|
||||
|
||||
|
||||
Reference in New Issue
Block a user