Remove explicit usage transition from the API and validation

This removes the following for both Buffer and Texture:
 - The builder's SetInitialUsage
 - The object's FreezeUsage and TransitionUsage methods
 - The CommandBuffer Transition<Object>Usage methods

All samples and tests are simplified as a result. This also obsoletes
the UsageValidationTest which is removed.

Some validation was dependent on "current usage" and hasn't been
reintroduced for implicit transitions yet:
 - Buffers can be used while mapped
 - Swapchain textures can be used after they have been presented.

Validation for these will involve collecting all the resources used by a
command buffer and will be done in a follow-up patch.

src/tests/unittests/validation/BindGroupValidationTests.cpp

@@ -26,7 +26,6 @@ TEST_F(BindGroupValidationTest, BufferViewOffset) {
 
     auto buffer = device.CreateBufferBuilder()
         .SetAllowedUsage(nxt::BufferUsageBit::Uniform)
-        .SetInitialUsage(nxt::BufferUsageBit::Uniform)
         .SetSize(512)
         .GetResult();
 

src/tests/unittests/validation/BufferValidationTests.cpp

@@ -46,21 +46,18 @@ class BufferValidationTest : public ValidationTest {
             return device.CreateBufferBuilder()
                 .SetSize(size)
                 .SetAllowedUsage(nxt::BufferUsageBit::MapRead)
-                .SetInitialUsage(nxt::BufferUsageBit::MapRead)
                 .GetResult();
         }
         nxt::Buffer CreateMapWriteBuffer(uint32_t size) {
             return device.CreateBufferBuilder()
                 .SetSize(size)
                 .SetAllowedUsage(nxt::BufferUsageBit::MapWrite)
-                .SetInitialUsage(nxt::BufferUsageBit::MapWrite)
                 .GetResult();
         }
         nxt::Buffer CreateSetSubDataBuffer(uint32_t size) {
             return device.CreateBufferBuilder()
                 .SetSize(size)
                 .SetAllowedUsage(nxt::BufferUsageBit::TransferDst)
-                .SetInitialUsage(nxt::BufferUsageBit::TransferDst)
                 .GetResult();
         }
 
@@ -86,15 +83,6 @@ class BufferValidationTest : public ValidationTest {
 // Test case where creation should succeed
 TEST_F(BufferValidationTest, CreationSuccess) {
     // Success
-    {
-        nxt::Buffer buf = AssertWillBeSuccess(device.CreateBufferBuilder())
-            .SetSize(4)
-            .SetAllowedUsage(nxt::BufferUsageBit::Uniform)
-            .SetInitialUsage(nxt::BufferUsageBit::Uniform)
-            .GetResult();
-    }
-
-    // Success, when no initial usage is set
     {
         nxt::Buffer buf = AssertWillBeSuccess(device.CreateBufferBuilder())
             .SetSize(4)
@@ -111,7 +99,6 @@ TEST_F(BufferValidationTest, CreationDuplicates) {
             .SetSize(4)
             .SetSize(3)
             .SetAllowedUsage(nxt::BufferUsageBit::Uniform)
-            .SetInitialUsage(nxt::BufferUsageBit::Uniform)
             .GetResult();
     }
 
@@ -121,28 +108,8 @@ TEST_F(BufferValidationTest, CreationDuplicates) {
             .SetSize(4)
             .SetAllowedUsage(nxt::BufferUsageBit::Vertex)
             .SetAllowedUsage(nxt::BufferUsageBit::Uniform)
-            .SetInitialUsage(nxt::BufferUsageBit::Uniform)
             .GetResult();
     }
-
-    // When initial usage is specified multiple times
-    {
-        nxt::Buffer buf = AssertWillBeError(device.CreateBufferBuilder())
-            .SetSize(4)
-            .SetAllowedUsage(nxt::BufferUsageBit::Uniform | nxt::BufferUsageBit::Vertex)
-            .SetInitialUsage(nxt::BufferUsageBit::Uniform)
-            .SetInitialUsage(nxt::BufferUsageBit::Vertex)
-            .GetResult();
-    }
-}
-
-// Test failure when the initial usage isn't a subset of the allowed usage
-TEST_F(BufferValidationTest, CreationInitialNotSubsetOfAllowed) {
-        nxt::Buffer buf = AssertWillBeError(device.CreateBufferBuilder())
-            .SetSize(4)
-            .SetAllowedUsage(nxt::BufferUsageBit::Uniform)
-            .SetInitialUsage(nxt::BufferUsageBit::Vertex)
-            .GetResult();
 }
 
 // Test failure when required properties are missing
@@ -251,8 +218,7 @@ TEST_F(BufferValidationTest, MapWriteOutOfRange) {
 TEST_F(BufferValidationTest, MapReadWrongUsage) {
     nxt::Buffer buf = device.CreateBufferBuilder()
         .SetSize(4)
-        .SetAllowedUsage(nxt::BufferUsageBit::MapRead | nxt::BufferUsageBit::TransferDst)
-        .SetInitialUsage(nxt::BufferUsageBit::TransferDst)
+        .SetAllowedUsage(nxt::BufferUsageBit::TransferDst)
         .GetResult();
 
     nxt::CallbackUserdata userdata = 40600;
@@ -266,8 +232,7 @@ TEST_F(BufferValidationTest, MapReadWrongUsage) {
 TEST_F(BufferValidationTest, MapWriteWrongUsage) {
     nxt::Buffer buf = device.CreateBufferBuilder()
         .SetSize(4)
-        .SetAllowedUsage(nxt::BufferUsageBit::MapWrite | nxt::BufferUsageBit::TransferSrc)
-        .SetInitialUsage(nxt::BufferUsageBit::TransferSrc)
+        .SetAllowedUsage(nxt::BufferUsageBit::TransferSrc)
         .GetResult();
 
     nxt::CallbackUserdata userdata = 40600;
@@ -505,8 +470,7 @@ TEST_F(BufferValidationTest, SetSubDataOutOfBounds) {
 TEST_F(BufferValidationTest, SetSubDataWrongUsage) {
     nxt::Buffer buf = device.CreateBufferBuilder()
         .SetSize(1)
-        .SetAllowedUsage(nxt::BufferUsageBit::TransferDst | nxt::BufferUsageBit::Vertex)
-        .SetInitialUsage(nxt::BufferUsageBit::Vertex)
+        .SetAllowedUsage(nxt::BufferUsageBit::Vertex)
         .GetResult();
 
     uint8_t foo = 0;

src/tests/unittests/validation/CopyCommandsValidationTests.cpp

@@ -23,11 +23,10 @@ class CopyCommandTest : public ValidationTest {
                 .SetSize(size)
                 .SetAllowedUsage(usage)
                 .GetResult();
-            buf.FreezeUsage(usage);
             return buf;
         }
 
-        nxt::Texture CreateFrozen2DTexture(uint32_t width, uint32_t height, uint32_t levels,
+        nxt::Texture Create2DTexture(uint32_t width, uint32_t height, uint32_t levels,
                                          nxt::TextureFormat format, nxt::TextureUsageBit usage) {
             nxt::Texture tex = AssertWillBeSuccess(device.CreateTextureBuilder())
                 .SetDimension(nxt::TextureDimension::e2D)
@@ -36,7 +35,6 @@ class CopyCommandTest : public ValidationTest {
                 .SetMipLevels(levels)
                 .SetAllowedUsage(usage)
                 .GetResult();
-            tex.FreezeUsage(usage);
             return tex;
         }
 
@@ -123,7 +121,7 @@ class CopyCommandTest_B2T : public CopyCommandTest {
 TEST_F(CopyCommandTest_B2T, Success) {
     uint32_t bufferSize = BufferSizeForTextureCopy(4, 4, 1);
     nxt::Buffer source = CreateFrozenBuffer(bufferSize, nxt::BufferUsageBit::TransferSrc);
-    nxt::Texture destination = CreateFrozen2DTexture(16, 16, 5, nxt::TextureFormat::R8G8B8A8Unorm,
+    nxt::Texture destination = Create2DTexture(16, 16, 5, nxt::TextureFormat::R8G8B8A8Unorm,
                                                      nxt::TextureUsageBit::TransferDst);
 
     // Different copies, including some that touch the OOB condition
@@ -169,7 +167,7 @@ TEST_F(CopyCommandTest_B2T, Success) {
 TEST_F(CopyCommandTest_B2T, OutOfBoundsOnBuffer) {
     uint32_t bufferSize = BufferSizeForTextureCopy(4, 4, 1);
     nxt::Buffer source = CreateFrozenBuffer(bufferSize, nxt::BufferUsageBit::TransferSrc);
-    nxt::Texture destination = CreateFrozen2DTexture(16, 16, 5, nxt::TextureFormat::R8G8B8A8Unorm,
+    nxt::Texture destination = Create2DTexture(16, 16, 5, nxt::TextureFormat::R8G8B8A8Unorm,
                                                      nxt::TextureUsageBit::TransferDst);
 
     // OOB on the buffer because we copy too many pixels
@@ -209,7 +207,7 @@ TEST_F(CopyCommandTest_B2T, OutOfBoundsOnBuffer) {
 TEST_F(CopyCommandTest_B2T, OutOfBoundsOnTexture) {
     uint32_t bufferSize = BufferSizeForTextureCopy(4, 4, 1);
     nxt::Buffer source = CreateFrozenBuffer(bufferSize, nxt::BufferUsageBit::TransferSrc);
-    nxt::Texture destination = CreateFrozen2DTexture(16, 16, 5, nxt::TextureFormat::R8G8B8A8Unorm,
+    nxt::Texture destination = Create2DTexture(16, 16, 5, nxt::TextureFormat::R8G8B8A8Unorm,
                                                      nxt::TextureUsageBit::TransferDst);
 
     // OOB on the texture because x + width overflows
@@ -244,7 +242,7 @@ TEST_F(CopyCommandTest_B2T, OutOfBoundsOnTexture) {
 // Test that we force Z=0 and Depth=1 on copies to 2D textures
 TEST_F(CopyCommandTest_B2T, ZDepthConstraintFor2DTextures) {
     nxt::Buffer source = CreateFrozenBuffer(16 * 4, nxt::BufferUsageBit::TransferSrc);
-    nxt::Texture destination = CreateFrozen2DTexture(16, 16, 5, nxt::TextureFormat::R8G8B8A8Unorm,
+    nxt::Texture destination = Create2DTexture(16, 16, 5, nxt::TextureFormat::R8G8B8A8Unorm,
                                                      nxt::TextureUsageBit::TransferDst);
 
     // Z=1 on an empty copy still errors
@@ -266,9 +264,9 @@ TEST_F(CopyCommandTest_B2T, ZDepthConstraintFor2DTextures) {
 TEST_F(CopyCommandTest_B2T, IncorrectUsage) {
     nxt::Buffer source = CreateFrozenBuffer(16 * 4, nxt::BufferUsageBit::TransferSrc);
     nxt::Buffer vertex = CreateFrozenBuffer(16 * 4, nxt::BufferUsageBit::Vertex);
-    nxt::Texture destination = CreateFrozen2DTexture(16, 16, 5, nxt::TextureFormat::R8G8B8A8Unorm,
+    nxt::Texture destination = Create2DTexture(16, 16, 5, nxt::TextureFormat::R8G8B8A8Unorm,
                                                      nxt::TextureUsageBit::TransferDst);
-    nxt::Texture sampled = CreateFrozen2DTexture(16, 16, 5, nxt::TextureFormat::R8G8B8A8Unorm,
+    nxt::Texture sampled = Create2DTexture(16, 16, 5, nxt::TextureFormat::R8G8B8A8Unorm,
                                                  nxt::TextureUsageBit::Sampled);
 
     // Incorrect source usage
@@ -289,7 +287,7 @@ TEST_F(CopyCommandTest_B2T, IncorrectUsage) {
 TEST_F(CopyCommandTest_B2T, IncorrectRowPitch) {
     uint32_t bufferSize = BufferSizeForTextureCopy(128, 16, 1);
     nxt::Buffer source = CreateFrozenBuffer(bufferSize, nxt::BufferUsageBit::TransferSrc);
-    nxt::Texture destination = CreateFrozen2DTexture(128, 16, 5, nxt::TextureFormat::R8G8B8A8Unorm,
+    nxt::Texture destination = Create2DTexture(128, 16, 5, nxt::TextureFormat::R8G8B8A8Unorm,
         nxt::TextureUsageBit::TransferDst);
 
     // Default row pitch is not 256-byte aligned
@@ -318,7 +316,7 @@ TEST_F(CopyCommandTest_B2T, IncorrectRowPitch) {
 TEST_F(CopyCommandTest_B2T, IncorrectBufferOffset) {
     uint32_t bufferSize = BufferSizeForTextureCopy(4, 4, 1);
     nxt::Buffer source = CreateFrozenBuffer(bufferSize, nxt::BufferUsageBit::TransferSrc);
-    nxt::Texture destination = CreateFrozen2DTexture(16, 16, 5, nxt::TextureFormat::R8G8B8A8Unorm,
+    nxt::Texture destination = Create2DTexture(16, 16, 5, nxt::TextureFormat::R8G8B8A8Unorm,
                                                      nxt::TextureUsageBit::TransferDst);
 
     // Correct usage
@@ -351,7 +349,7 @@ class CopyCommandTest_T2B : public CopyCommandTest {
 // Test a successfull T2B copy
 TEST_F(CopyCommandTest_T2B, Success) {
     uint32_t bufferSize = BufferSizeForTextureCopy(4, 4, 1);
-    nxt::Texture source = CreateFrozen2DTexture(16, 16, 5, nxt::TextureFormat::R8G8B8A8Unorm,
+    nxt::Texture source = Create2DTexture(16, 16, 5, nxt::TextureFormat::R8G8B8A8Unorm,
                                                 nxt::TextureUsageBit::TransferSrc);
     nxt::Buffer destination = CreateFrozenBuffer(bufferSize, nxt::BufferUsageBit::TransferDst);
 
@@ -397,7 +395,7 @@ TEST_F(CopyCommandTest_T2B, Success) {
 // Test OOB conditions on the texture
 TEST_F(CopyCommandTest_T2B, OutOfBoundsOnTexture) {
     uint32_t bufferSize = BufferSizeForTextureCopy(4, 4, 1);
-    nxt::Texture source = CreateFrozen2DTexture(16, 16, 5, nxt::TextureFormat::R8G8B8A8Unorm,
+    nxt::Texture source = Create2DTexture(16, 16, 5, nxt::TextureFormat::R8G8B8A8Unorm,
                                                 nxt::TextureUsageBit::TransferSrc);
     nxt::Buffer destination = CreateFrozenBuffer(bufferSize, nxt::BufferUsageBit::TransferDst);
 
@@ -433,7 +431,7 @@ TEST_F(CopyCommandTest_T2B, OutOfBoundsOnTexture) {
 // Test OOB conditions on the buffer
 TEST_F(CopyCommandTest_T2B, OutOfBoundsOnBuffer) {
     uint32_t bufferSize = BufferSizeForTextureCopy(4, 4, 1);
-    nxt::Texture source = CreateFrozen2DTexture(16, 16, 5, nxt::TextureFormat::R8G8B8A8Unorm,
+    nxt::Texture source = Create2DTexture(16, 16, 5, nxt::TextureFormat::R8G8B8A8Unorm,
                                                 nxt::TextureUsageBit::TransferSrc);
     nxt::Buffer destination = CreateFrozenBuffer(bufferSize, nxt::BufferUsageBit::TransferDst);
 
@@ -473,7 +471,7 @@ TEST_F(CopyCommandTest_T2B, OutOfBoundsOnBuffer) {
 // Test that we force Z=0 and Depth=1 on copies from to 2D textures
 TEST_F(CopyCommandTest_T2B, ZDepthConstraintFor2DTextures) {
     uint32_t bufferSize = BufferSizeForTextureCopy(4, 4, 1);
-    nxt::Texture source = CreateFrozen2DTexture(16, 16, 5, nxt::TextureFormat::R8G8B8A8Unorm,
+    nxt::Texture source = Create2DTexture(16, 16, 5, nxt::TextureFormat::R8G8B8A8Unorm,
                                                 nxt::TextureUsageBit::TransferSrc);
     nxt::Buffer destination = CreateFrozenBuffer(bufferSize, nxt::BufferUsageBit::TransferDst);
 
@@ -495,9 +493,9 @@ TEST_F(CopyCommandTest_T2B, ZDepthConstraintFor2DTextures) {
 // Test T2B copies with incorrect buffer usage
 TEST_F(CopyCommandTest_T2B, IncorrectUsage) {
     uint32_t bufferSize = BufferSizeForTextureCopy(4, 4, 1);
-    nxt::Texture source = CreateFrozen2DTexture(16, 16, 5, nxt::TextureFormat::R8G8B8A8Unorm,
+    nxt::Texture source = Create2DTexture(16, 16, 5, nxt::TextureFormat::R8G8B8A8Unorm,
                                                 nxt::TextureUsageBit::TransferSrc);
-    nxt::Texture sampled = CreateFrozen2DTexture(16, 16, 5, nxt::TextureFormat::R8G8B8A8Unorm,
+    nxt::Texture sampled = Create2DTexture(16, 16, 5, nxt::TextureFormat::R8G8B8A8Unorm,
                                                  nxt::TextureUsageBit::Sampled);
     nxt::Buffer destination = CreateFrozenBuffer(bufferSize, nxt::BufferUsageBit::TransferDst);
     nxt::Buffer vertex = CreateFrozenBuffer(bufferSize, nxt::BufferUsageBit::Vertex);
@@ -519,7 +517,7 @@ TEST_F(CopyCommandTest_T2B, IncorrectUsage) {
 
 TEST_F(CopyCommandTest_T2B, IncorrectRowPitch) {
     uint32_t bufferSize = BufferSizeForTextureCopy(128, 16, 1);
-    nxt::Texture source = CreateFrozen2DTexture(128, 16, 5, nxt::TextureFormat::R8G8B8A8Unorm,
+    nxt::Texture source = Create2DTexture(128, 16, 5, nxt::TextureFormat::R8G8B8A8Unorm,
         nxt::TextureUsageBit::TransferDst);
     nxt::Buffer destination = CreateFrozenBuffer(bufferSize, nxt::BufferUsageBit::TransferSrc);
 
@@ -548,7 +546,7 @@ TEST_F(CopyCommandTest_T2B, IncorrectRowPitch) {
 // Test T2B copies with incorrect buffer offset usage
 TEST_F(CopyCommandTest_T2B, IncorrectBufferOffset) {
     uint32_t bufferSize = BufferSizeForTextureCopy(128, 16, 1);
-    nxt::Texture source = CreateFrozen2DTexture(128, 16, 5, nxt::TextureFormat::R8G8B8A8Unorm,
+    nxt::Texture source = Create2DTexture(128, 16, 5, nxt::TextureFormat::R8G8B8A8Unorm,
         nxt::TextureUsageBit::TransferSrc);
     nxt::Buffer destination = CreateFrozenBuffer(bufferSize, nxt::BufferUsageBit::TransferDst);
 

src/tests/unittests/validation/RenderPassDescriptorValidationTests.cpp

@@ -28,7 +28,6 @@ nxt::TextureView Create2DAttachment(nxt::Device& device, uint32_t width, uint32_
         .SetFormat(format)
         .SetMipLevels(1)
         .SetAllowedUsage(nxt::TextureUsageBit::OutputAttachment)
-        .SetInitialUsage(nxt::TextureUsageBit::OutputAttachment)
         .GetResult();
 
     return attachment.CreateTextureViewBuilder()

src/tests/unittests/validation/UsageValidationTests.cpp

@@ -1,56 +0,0 @@
-// Copyright 2017 The NXT Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include "tests/unittests/validation/ValidationTest.h"
-
-#include <gmock/gmock.h>
-
-using namespace testing;
-
-class UsageValidationTest : public ValidationTest {
-    protected:
-        nxt::Queue queue;
-
-    private:
-        void SetUp() override {
-            ValidationTest::SetUp();
-            queue = device.CreateQueue();
-        }
-};
-
-// Test that command buffer submit changes buffer usage
-TEST_F(UsageValidationTest, UsageAfterCommandBuffer) {
-    // TODO(kainino@chromium.org): This needs to be tested on every backend.
-    // Should we make an end2end test that tests this as well?
-
-    nxt::Buffer buf = device.CreateBufferBuilder()
-        .SetSize(1)
-        .SetAllowedUsage(nxt::BufferUsageBit::TransferDst | nxt::BufferUsageBit::Vertex)
-        .SetInitialUsage(nxt::BufferUsageBit::TransferDst)
-        .GetResult();
-
-    uint8_t foo = 0;
-    buf.SetSubData(0, sizeof(foo), &foo);
-
-    buf.TransitionUsage(nxt::BufferUsageBit::Vertex);
-    ASSERT_DEVICE_ERROR(buf.SetSubData(0, sizeof(foo), &foo));
-
-    nxt::CommandBuffer cmdbuf = device.CreateCommandBufferBuilder()
-        .TransitionBufferUsage(buf, nxt::BufferUsageBit::TransferDst)
-        .GetResult();
-    queue.Submit(1, &cmdbuf);
-    // buf should be in TransferDst usage
-
-    buf.SetSubData(0, sizeof(foo), &foo);
-}

src/tests/unittests/validation/ValidationTest.cpp

@@ -77,7 +77,6 @@ nxt::RenderPassDescriptor ValidationTest::CreateSimpleRenderPass() {
             .SetMipLevels(1)
             .SetAllowedUsage(nxt::TextureUsageBit::OutputAttachment)
             .GetResult();
-        colorBuffer.FreezeUsage(nxt::TextureUsageBit::OutputAttachment);
         auto colorView = colorBuffer.CreateTextureViewBuilder()
             .GetResult();
 
@@ -126,7 +125,6 @@ ValidationTest::DummyRenderPass ValidationTest::CreateDummyRenderPass() {
         .SetMipLevels(1)
         .SetAllowedUsage(nxt::TextureUsageBit::OutputAttachment)
         .GetResult();
-    dummy.attachment.FreezeUsage(nxt::TextureUsageBit::OutputAttachment);
 
     nxt::TextureView view = AssertWillBeSuccess(dummy.attachment.CreateTextureViewBuilder()).GetResult();
 

src/tests/unittests/validation/VertexBufferValidationTests.cpp

@@ -41,7 +41,6 @@ class VertexBufferValidationTest : public ValidationTest {
                     .SetSize(256)
                     .SetAllowedUsage(nxt::BufferUsageBit::Vertex)
                     .GetResult();
-                buffer.FreezeUsage(nxt::BufferUsageBit::Vertex);
             }
             return buffers;
         }