Cleanups related to RIFF support (#7041)

3 files changed, 10 insertions, 10 deletions

diff --git a/tools/gfx-unit-test/copy-texture-tests.cpp b/tools/gfx-unit-test/copy-texture-tests.cpp
index f6f85f9f4..02df67378 100644
--- a/tools/gfx-unit-test/copy-texture-tests.cpp
+++ b/tools/gfx-unit-test/copy-texture-tests.cpp
@@ -37,7 +37,7 @@ struct BaseCopyTextureTest
     IDevice* device;
     UnitTestContext* context;
 
-    Size alignedRowStride;
+    gfx::Size alignedRowStride;
 
     RefPtr<TextureInfo> srcTextureInfo;
     RefPtr<TextureInfo> dstTextureInfo;
diff --git a/tools/gfx-unit-test/gfx-test-texture-util.cpp b/tools/gfx-unit-test/gfx-test-texture-util.cpp
index 7e6d738ee..a0212b7b0 100644
--- a/tools/gfx-unit-test/gfx-test-texture-util.cpp
+++ b/tools/gfx-unit-test/gfx-test-texture-util.cpp
@@ -42,7 +42,7 @@ TextureAspect getTextureAspect(Format format)
     }
 }
 
-Size getTexelSize(Format format)
+gfx::Size getTexelSize(Format format)
 {
     FormatInfo info;
     GFX_CHECK_CALL_ABORT(gfxGetFormatInfo(format, &info));
@@ -285,8 +285,8 @@ List<uint8_t> removePadding(
     ISlangBlob* pixels,
     GfxCount width,
     GfxCount height,
-    Size rowPitch,
-    Size pixelSize)
+    gfx::Size rowPitch,
+    gfx::Size pixelSize)
 {
     List<uint8_t> buffer;
     buffer.setCount(height * rowPitch);
diff --git a/tools/gfx-unit-test/gfx-test-texture-util.h b/tools/gfx-unit-test/gfx-test-texture-util.h
index 6a98eec43..d084628e2 100644
--- a/tools/gfx-unit-test/gfx-test-texture-util.h
+++ b/tools/gfx-unit-test/gfx-test-texture-util.h
@@ -12,9 +12,9 @@ namespace gfx_test
 {
 struct Strides
 {
-    Size x;
-    Size y;
-    Size z;
+    gfx::Size x;
+    gfx::Size y;
+    gfx::Size z;
 };
 
 struct ValidationTextureFormatBase : RefObject
@@ -194,7 +194,7 @@ struct TextureInfo : RefObject
 };
 
 TextureAspect getTextureAspect(Format format);
-Size getTexelSize(Format format);
+gfx::Size getTexelSize(Format format);
 GfxIndex getSubresourceIndex(GfxIndex mipLevel, GfxCount mipLevelCount, GfxIndex baseArrayLayer);
 RefPtr<ValidationTextureFormatBase> getValidationTextureFormat(Format format);
 void generateTextureData(
@@ -205,8 +205,8 @@ List<uint8_t> removePadding(
     ISlangBlob* pixels,
     GfxCount width,
     GfxCount height,
-    Size rowPitch,
-    Size pixelSize);
+    gfx::Size rowPitch,
+    gfx::Size pixelSize);
 Slang::Result writeImage(const char* filename, ISlangBlob* pixels, uint32_t width, uint32_t height);
 Slang::Result writeImage(
     const char* filename,