encounter
/
dawn-cmake
mirror of https://github.com/encounter/dawn-cmake.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CopyTextureForBrowser(): Support Alpha Ops 

This CL adds the support ofwgpu::CopyTextureForBrowserOptions::alphaOps
for CopyTextureForBrowser(), which allows the user to specify the alpha
operations (DontChange, Premultiply, Unpremultiply) when calling
CopyTextureForBrowser().

BUG=chromium:1217153

Change-Id: Idb5dd4482b33f2ada9aafc24380afeb48f2e26bc
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/54800
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Commit-Queue: Shaobo Yan <shaobo.yan@intel.com>
This commit is contained in:
Yan, Shaobo 2021-06-21 10:05:37 +00:00 committed by Dawn LUCI CQ
parent e4f4a3711f
commit 55e08d567f
3 changed files with 176 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dawn.json
View File

@ -624,11 +624,20 @@
{"name": "compute stage", "type": "programmable stage descriptor"} {"name": "compute stage", "type": "programmable stage descriptor"}
] ]
}, },
"alpha op": {
"category": "enum",
"values": [
{"value": 0, "name": "dont change"},
{"value": 1, "name": "premultiply"},
{"value": 2, "name": "unpremultiply"}
]
},
"copy texture for browser options": { "copy texture for browser options": {
"category": "structure", "category": "structure",
"extensible": true, "extensible": true,
"members": [ "members": [
{"name": "flipY", "type": "bool", "default": "false"} {"name": "flipY", "type": "bool", "default": "false"},
{"name": "alphaOp", "type": "alpha op", "default": "dont change"}
] ]
}, },
"create compute pipeline async callback": { "create compute pipeline async callback": {

70
src/dawn_native/CopyTextureForBrowserHelper.cpp
View File

@ -27,17 +27,25 @@
#include "dawn_native/RenderPipeline.h" #include "dawn_native/RenderPipeline.h"
#include "dawn_native/Sampler.h" #include "dawn_native/Sampler.h"
#include "dawn_native/Texture.h" #include "dawn_native/Texture.h"
#include "dawn_native/ValidationUtils_autogen.h"
#include <unordered_set> #include <unordered_set>
namespace dawn_native { namespace dawn_native {
namespace { namespace {
// TODO(crbug.com/dawn/856) : Support premultiply-alpha // TODO(crbug.com/1221110): Remove this header macro by merging vertex and
static const char sCopyTextureForBrowserVertex[] = R"( // fragment shaders into one shader source. Now it blocks by
// crbug.com/dawn/947 and crbug.com/tint/915
#define HEADER \
R"(
[[block]] struct Uniforms { [[block]] struct Uniforms {
u_scale: vec2<f32>; u_scale: vec2<f32>;
u_offset: vec2<f32>; u_offset: vec2<f32>;
u_alphaOp: u32;
}; };
)"
static const char sCopyTextureForBrowserVertex[] = HEADER R"(
[[binding(0), group(0)]] var<uniform> uniforms : Uniforms; [[binding(0), group(0)]] var<uniform> uniforms : Uniforms;
struct VertexOutputs { struct VertexOutputs {
@ -80,7 +88,8 @@ namespace dawn_native {
} }
)"; )";
static const char sCopyTextureForBrowserFragment[] = R"( static const char sCopyTextureForBrowserFragment[] = HEADER R"(
[[binding(0), group(0)]] var<uniform> uniforms : Uniforms;
[[binding(1), group(0)]] var mySampler: sampler; [[binding(1), group(0)]] var mySampler: sampler;
[[binding(2), group(0)]] var myTexture: texture_2d<f32>; [[binding(2), group(0)]] var myTexture: texture_2d<f32>;
@ -94,13 +103,48 @@ namespace dawn_native {
discard; discard;
} }
var srcColor = textureSample(myTexture, mySampler, texcoord);
// Swizzling of texture formats when sampling / rendering is handled by the // Swizzling of texture formats when sampling / rendering is handled by the
// hardware so we don't need special logic in this shader. This is covered by tests. // hardware so we don't need special logic in this shader. This is covered by tests.
var srcColor = textureSample(myTexture, mySampler, texcoord);
// Handle alpha. Alpha here helps on the source content and dst content have
// different alpha config. There are three possible ops: DontChange, Premultiply
// and Unpremultiply.
// TODO(crbug.com/1217153): if wgsl support `constexpr` and allow it
// to be case selector, Replace 0u/1u/2u with a constexpr variable with
// meaningful name.
switch(uniforms.u_alphaOp) {
case 0u: { // AlphaOp: DontChange
break;
}
case 1u: { // AlphaOp: Premultiply
srcColor = vec4<f32>(srcColor.rgb * srcColor.a, srcColor.a);
break;
}
case 2u: { // AlphaOp: Unpremultiply
if (srcColor.a != 0.0) {
srcColor = vec4<f32>(srcColor.rgb / srcColor.a, srcColor.a);
}
break;
}
default: {
break;
}
}
return srcColor; return srcColor;
} }
)"; )";
struct Uniform {
float scaleX;
float scaleY;
float offsetX;
float offsetY;
wgpu::AlphaOp alphaOp;
};
static_assert(sizeof(Uniform) == 20, "");
// TODO(crbug.com/dawn/856): Expand copyTextureForBrowser to support any // TODO(crbug.com/dawn/856): Expand copyTextureForBrowser to support any
// non-depth, non-stencil, non-compressed texture format pair copy. Now this API // non-depth, non-stencil, non-compressed texture format pair copy. Now this API
// supports CopyImageBitmapToTexture normal format pairs. // supports CopyImageBitmapToTexture normal format pairs.
@ -139,6 +183,8 @@ namespace dawn_native {
"CopyTextureForBrowserOptions: nextInChain must be nullptr"); "CopyTextureForBrowserOptions: nextInChain must be nullptr");
} }
DAWN_TRY(ValidateAlphaOp(options->alphaOp));
return {}; return {};
} }
@ -307,28 +353,32 @@ namespace dawn_native {
Extent3D srcTextureSize = source->texture->GetSize(); Extent3D srcTextureSize = source->texture->GetSize();
// Prepare binding 0 resource: uniform buffer. // Prepare binding 0 resource: uniform buffer.
float uniformData[] = { Uniform uniformData = {
copySize->width / static_cast<float>(srcTextureSize.width), copySize->width / static_cast<float>(srcTextureSize.width),
copySize->height / static_cast<float>(srcTextureSize.height), // scale copySize->height / static_cast<float>(srcTextureSize.height), // scale
source->origin.x / static_cast<float>(srcTextureSize.width), source->origin.x / static_cast<float>(srcTextureSize.width),
source->origin.y / static_cast<float>(srcTextureSize.height) // offset source->origin.y / static_cast<float>(srcTextureSize.height), // offset
wgpu::AlphaOp::DontChange // alphaOp default value: DontChange
}; };
// Handle flipY. FlipY here means we flip the source texture firstly and then // Handle flipY. FlipY here means we flip the source texture firstly and then
// do copy. This helps on the case which source texture is flipped and the copy // do copy. This helps on the case which source texture is flipped and the copy
// need to unpack the flip. // need to unpack the flip.
if (options && options->flipY) { if (options->flipY) {
uniformData[1] *= -1.0; uniformData.scaleY *= -1.0;
uniformData[3] += copySize->height / static_cast<float>(srcTextureSize.height); uniformData.offsetY += copySize->height / static_cast<float>(srcTextureSize.height);
} }
// Set alpha op.
uniformData.alphaOp = options->alphaOp;
BufferDescriptor uniformDesc = {}; BufferDescriptor uniformDesc = {};
uniformDesc.usage = wgpu::BufferUsage::CopyDst | wgpu::BufferUsage::Uniform; uniformDesc.usage = wgpu::BufferUsage::CopyDst | wgpu::BufferUsage::Uniform;
uniformDesc.size = sizeof(uniformData); uniformDesc.size = sizeof(uniformData);
Ref<BufferBase> uniformBuffer; Ref<BufferBase> uniformBuffer;
DAWN_TRY_ASSIGN(uniformBuffer, device->CreateBuffer(&uniformDesc)); DAWN_TRY_ASSIGN(uniformBuffer, device->CreateBuffer(&uniformDesc));
DAWN_TRY(device->GetQueue()->WriteBuffer(uniformBuffer.Get(), 0, uniformData, DAWN_TRY(device->GetQueue()->WriteBuffer(uniformBuffer.Get(), 0, &uniformData,
sizeof(uniformData))); sizeof(uniformData)));
// Prepare binding 1 resource: sampler // Prepare binding 1 resource: sampler

123
src/tests/end2end/CopyTextureForBrowserTests.cpp
View File

@ -29,7 +29,7 @@ namespace {
static constexpr uint64_t kDefaultTextureHeight = 1; static constexpr uint64_t kDefaultTextureHeight = 1;
// Dst texture format copyTextureForBrowser accept // Dst texture format copyTextureForBrowser accept
static const wgpu::TextureFormat kDstTextureFormat[] = { static const wgpu::TextureFormat kDstTextureFormats[] = {
wgpu::TextureFormat::RGBA8Unorm, wgpu::TextureFormat::BGRA8Unorm, wgpu::TextureFormat::RGBA8Unorm, wgpu::TextureFormat::BGRA8Unorm,
wgpu::TextureFormat::RGBA32Float, wgpu::TextureFormat::RG8Unorm, wgpu::TextureFormat::RGBA32Float, wgpu::TextureFormat::RG8Unorm,
wgpu::TextureFormat::RGBA16Float, wgpu::TextureFormat::RG16Float, wgpu::TextureFormat::RGBA16Float, wgpu::TextureFormat::RG16Float,
@ -37,7 +37,10 @@ namespace {
static const wgpu::Origin3D kOrigins[] = {{1, 1}, {1, 2}, {2, 1}}; static const wgpu::Origin3D kOrigins[] = {{1, 1}, {1, 2}, {2, 1}};
static const wgpu::Extent3D kCopySize[] = {{1, 1}, {2, 1}, {1, 2}, {2, 2}}; static const wgpu::Extent3D kCopySizes[] = {{1, 1}, {2, 1}, {1, 2}, {2, 2}};
static const wgpu::AlphaOp kAlphaOps[] = {wgpu::AlphaOp::DontChange, wgpu::AlphaOp::Premultiply,
wgpu::AlphaOp::Unpremultiply};
} // anonymous namespace } // anonymous namespace
class CopyTextureForBrowserTests : public DawnTest { class CopyTextureForBrowserTests : public DawnTest {
@ -83,7 +86,9 @@ class CopyTextureForBrowserTests : public DawnTest {
// Source texture contains red pixels and dst texture contains green pixels at start. // Source texture contains red pixels and dst texture contains green pixels at start.
static std::vector<RGBA8> GetTextureData(const utils::TextureDataCopyLayout& layout, static std::vector<RGBA8> GetTextureData(const utils::TextureDataCopyLayout& layout,
TextureCopyRole textureRole) { TextureCopyRole textureRole,
wgpu::AlphaOp alphaOp = wgpu::AlphaOp::DontChange) {
std::array<uint8_t, 4> alpha = {0, 102, 153, 255}; // 0.0, 0.4, 0.6, 1.0
std::vector<RGBA8> textureData(layout.texelBlockCount); std::vector<RGBA8> textureData(layout.texelBlockCount);
for (uint32_t layer = 0; layer < layout.mipSize.depthOrArrayLayers; ++layer) { for (uint32_t layer = 0; layer < layout.mipSize.depthOrArrayLayers; ++layer) {
const uint32_t sliceOffset = layout.texelBlocksPerImage * layer; const uint32_t sliceOffset = layout.texelBlocksPerImage * layer;
@ -93,10 +98,33 @@ class CopyTextureForBrowserTests : public DawnTest {
// Source textures will have variable pixel data to cover cases like // Source textures will have variable pixel data to cover cases like
// flipY. // flipY.
if (textureRole == TextureCopyRole::SOURCE) { if (textureRole == TextureCopyRole::SOURCE) {
textureData[sliceOffset + rowOffset + x] = switch (alphaOp) {
RGBA8(static_cast<uint8_t>((x + layer * x) % 256), case wgpu::AlphaOp::DontChange:
textureData[sliceOffset + rowOffset + x] = RGBA8(
static_cast<uint8_t>((x + layer * x) % 256),
static_cast<uint8_t>((y + layer * y) % 256), static_cast<uint8_t>((y + layer * y) % 256),
static_cast<uint8_t>(x % 256), static_cast<uint8_t>(x % 256)); static_cast<uint8_t>(x % 256), static_cast<uint8_t>(x % 256));
break;
case wgpu::AlphaOp::Premultiply:
// For premultiply alpha test cases, we expect each channel in dst
// texture will equal to the alpha channel value.
textureData[sliceOffset + rowOffset + x] = RGBA8(
static_cast<uint8_t>(255), static_cast<uint8_t>(255),
static_cast<uint8_t>(255), static_cast<uint8_t>(alpha[x % 4]));
break;
case wgpu::AlphaOp::Unpremultiply:
// For unpremultiply alpha test cases, we expect each channel in dst
// texture will equal to 1.0.
textureData[sliceOffset + rowOffset + x] =
RGBA8(static_cast<uint8_t>(alpha[x % 4]),
static_cast<uint8_t>(alpha[x % 4]),
static_cast<uint8_t>(alpha[x % 4]),
static_cast<uint8_t>(alpha[x % 4]));
break;
default:
UNREACHABLE();
break;
}
} else { // Dst textures will have be init as `green` to ensure subrect } else { // Dst textures will have be init as `green` to ensure subrect
// copy not cross bound. // copy not cross bound.
textureData[sliceOffset + rowOffset + x] = textureData[sliceOffset + rowOffset + x] =
@ -118,9 +146,13 @@ class CopyTextureForBrowserTests : public DawnTest {
uint32_t uniformBufferData[] = { uint32_t uniformBufferData[] = {
0, // copy have flipY option 0, // copy have flipY option
4, // channelCount 4, // channelCount
0, 0, // uvec2, subrect copy src origin 0,
0, 0, // uvec2, subrect copy dst origin 0, // uvec2, subrect copy src origin
0, 0, // uvec2, subrect copy size 0,
0, // uvec2, subrect copy dst origin
0,
0, // uvec2, subrect copy size
static_cast<uint32_t>(wgpu::AlphaOp::DontChange), // AlphaOp: DontChange
}; };
wgpu::BufferDescriptor uniformBufferDesc = {}; wgpu::BufferDescriptor uniformBufferDesc = {};
@ -140,6 +172,7 @@ class CopyTextureForBrowserTests : public DawnTest {
srcCopyOrigin : vec2<u32>; srcCopyOrigin : vec2<u32>;
dstCopyOrigin : vec2<u32>; dstCopyOrigin : vec2<u32>;
copySize : vec2<u32>; copySize : vec2<u32>;
alphaOp : u32;
}; };
[[block]] struct OutputBuf { [[block]] struct OutputBuf {
result : array<u32>; result : array<u32>;
@ -154,11 +187,10 @@ class CopyTextureForBrowserTests : public DawnTest {
} }
[[stage(compute), workgroup_size(1, 1, 1)]] [[stage(compute), workgroup_size(1, 1, 1)]]
fn main([[builtin(global_invocation_id)]] GlobalInvocationID : vec3<u32>) { fn main([[builtin(global_invocation_id)]] GlobalInvocationID : vec3<u32>) {
let srcSize : vec2<i32> = textureDimensions(src); let srcSize = textureDimensions(src);
let dstSize : vec2<i32> = textureDimensions(dst); let dstSize = textureDimensions(dst);
let dstTexCoord : vec2<u32> = vec2<u32>(GlobalInvocationID.xy); let dstTexCoord = vec2<u32>(GlobalInvocationID.xy);
let nonCoveredColor : vec4<f32> = let nonCoveredColor = vec4<f32>(0.0, 1.0, 0.0, 1.0); // should be green
vec4<f32>(0.0, 1.0, 0.0, 1.0); // should be green
var success : bool = true; var success : bool = true;
if (dstTexCoord.x < uniforms.dstCopyOrigin.x || if (dstTexCoord.x < uniforms.dstCopyOrigin.x ||
@ -169,7 +201,7 @@ class CopyTextureForBrowserTests : public DawnTest {
all(textureLoad(dst, vec2<i32>(dstTexCoord), 0) == nonCoveredColor); all(textureLoad(dst, vec2<i32>(dstTexCoord), 0) == nonCoveredColor);
} else { } else {
// Calculate source texture coord. // Calculate source texture coord.
var srcTexCoord : vec2<u32> = dstTexCoord - uniforms.dstCopyOrigin + var srcTexCoord = dstTexCoord - uniforms.dstCopyOrigin +
uniforms.srcCopyOrigin; uniforms.srcCopyOrigin;
// Note that |flipY| equals flip src texture firstly and then do copy from src // Note that |flipY| equals flip src texture firstly and then do copy from src
// subrect to dst subrect. This helps on blink part to handle some input texture // subrect to dst subrect. This helps on blink part to handle some input texture
@ -179,8 +211,32 @@ class CopyTextureForBrowserTests : public DawnTest {
srcTexCoord.y = u32(srcSize.y) - srcTexCoord.y - 1u; srcTexCoord.y = u32(srcSize.y) - srcTexCoord.y - 1u;
} }
let srcColor : vec4<f32> = textureLoad(src, vec2<i32>(srcTexCoord), 0); var srcColor = textureLoad(src, vec2<i32>(srcTexCoord), 0);
let dstColor : vec4<f32> = textureLoad(dst, vec2<i32>(dstTexCoord), 0); var dstColor = textureLoad(dst, vec2<i32>(dstTexCoord), 0);
// Expect the dst texture channels should be all equal to alpha value
// after premultiply.
// TODO(crbug.com/1217153): if wgsl support `constexpr` and allow it
// to be case selector, Replace 0u/1u/2u with a constexpr variable with
// meaningful name.
switch(uniforms.alphaOp) {
case 0u: { // AlphaOp: DontChange
break;
}
case 1u: { // AlphaOp: Premultiply
srcColor = vec4<f32>(srcColor.rgb * srcColor.a, srcColor.a);
break;
}
case 2u: { // AlphaOp: Unpremultiply
if (srcColor.a != 0.0) {
srcColor = vec4<f32>(srcColor.rgb / srcColor.a, srcColor.a);
}
break;
}
default: {
break;
}
}
// Not use loop and variable index format to workaround // Not use loop and variable index format to workaround
// crbug.com/tint/638. // crbug.com/tint/638.
@ -196,8 +252,7 @@ class CopyTextureForBrowserTests : public DawnTest {
aboutEqual(dstColor.a, srcColor.a); aboutEqual(dstColor.a, srcColor.a);
} }
} }
let outputIndex : u32 = GlobalInvocationID.y * u32(dstSize.x) + let outputIndex = GlobalInvocationID.y * u32(dstSize.x) + GlobalInvocationID.x;
GlobalInvocationID.x;
if (success) { if (success) {
output.result[outputIndex] = 1u; output.result[outputIndex] = 1u;
} else { } else {
@ -258,7 +313,8 @@ class CopyTextureForBrowserTests : public DawnTest {
srcTextureArrayCopyData = GetFixedSourceTextureData(); srcTextureArrayCopyData = GetFixedSourceTextureData();
} else { // For other tests, the input format is always kTextureFormat. } else { // For other tests, the input format is always kTextureFormat.
srcTextureArrayCopyData = GetTextureData(srcCopyLayout, TextureCopyRole::SOURCE); srcTextureArrayCopyData =
GetTextureData(srcCopyLayout, TextureCopyRole::SOURCE, options.alphaOp);
} }
wgpu::ImageCopyTexture srcImageTextureInit = wgpu::ImageCopyTexture srcImageTextureInit =
@ -332,7 +388,8 @@ class CopyTextureForBrowserTests : public DawnTest {
dstSpec.copyOrigin.x, dstSpec.copyOrigin.x,
dstSpec.copyOrigin.y, // dst texture copy origin dstSpec.copyOrigin.y, // dst texture copy origin
copySize.width, copySize.width,
copySize.height // copy size copySize.height, // copy size
static_cast<uint32_t>(options.alphaOp) // alphaOp
}; };
device.GetQueue().WriteBuffer(uniformBuffer, 0, uniformBufferData, device.GetQueue().WriteBuffer(uniformBuffer, 0, uniformBufferData,
@ -459,7 +516,7 @@ TEST_P(CopyTextureForBrowserTests, FromRGBA8UnormCopy) {
// source texture format. // source texture format.
DAWN_SUPPRESS_TEST_IF(IsOpenGLES()); DAWN_SUPPRESS_TEST_IF(IsOpenGLES());
for (wgpu::TextureFormat dstFormat : kDstTextureFormat) { for (wgpu::TextureFormat dstFormat : kDstTextureFormats) {
TextureSpec srcTextureSpec = {}; // default format is RGBA8Unorm TextureSpec srcTextureSpec = {}; // default format is RGBA8Unorm
TextureSpec dstTextureSpec; TextureSpec dstTextureSpec;
@ -476,7 +533,7 @@ TEST_P(CopyTextureForBrowserTests, FromBGRA8UnormCopy) {
// source texture format. // source texture format.
DAWN_SUPPRESS_TEST_IF(IsOpenGLES()); DAWN_SUPPRESS_TEST_IF(IsOpenGLES());
for (wgpu::TextureFormat dstFormat : kDstTextureFormat) { for (wgpu::TextureFormat dstFormat : kDstTextureFormats) {
TextureSpec srcTextureSpec; TextureSpec srcTextureSpec;
srcTextureSpec.format = wgpu::TextureFormat::BGRA8Unorm; srcTextureSpec.format = wgpu::TextureFormat::BGRA8Unorm;
@ -497,7 +554,7 @@ TEST_P(CopyTextureForBrowserTests, CopySubRect) {
for (wgpu::Origin3D srcOrigin : kOrigins) { for (wgpu::Origin3D srcOrigin : kOrigins) {
for (wgpu::Origin3D dstOrigin : kOrigins) { for (wgpu::Origin3D dstOrigin : kOrigins) {
for (wgpu::Extent3D copySize : kCopySize) { for (wgpu::Extent3D copySize : kCopySizes) {
for (bool flipY : {true, false}) { for (bool flipY : {true, false}) {
TextureSpec srcTextureSpec; TextureSpec srcTextureSpec;
srcTextureSpec.copyOrigin = srcOrigin; srcTextureSpec.copyOrigin = srcOrigin;
@ -516,6 +573,26 @@ TEST_P(CopyTextureForBrowserTests, CopySubRect) {
} }
} }
// Verify |CopyTextureForBrowser| doing alphaOp.
// Test alpha ops: DontChange, Premultiply, Unpremultiply.
TEST_P(CopyTextureForBrowserTests, alphaOp) {
// Skip OpenGLES backend because it fails on using RGBA8Unorm as
// source texture format.
DAWN_SUPPRESS_TEST_IF(IsOpenGLES());
constexpr uint32_t kWidth = 10;
constexpr uint32_t kHeight = 10;
TextureSpec textureSpec;
textureSpec.textureSize = {kWidth, kHeight};
for (wgpu::AlphaOp alphaOp : kAlphaOps) {
wgpu::CopyTextureForBrowserOptions options = {};
options.alphaOp = alphaOp;
DoTest(textureSpec, textureSpec, {kWidth, kHeight}, options);
}
}
DAWN_INSTANTIATE_TEST(CopyTextureForBrowserTests, DAWN_INSTANTIATE_TEST(CopyTextureForBrowserTests,
D3D12Backend(), D3D12Backend(),
MetalBackend(), MetalBackend(),