mirror of
https://github.com/encounter/dawn-cmake.git
synced 2025-08-04 11:15:46 +00:00
4d3af66bbd
In order to preserve padding properly for MSL, we need to use its packed_vec type for all vec3 types in storage buffers, not just struct members. This commit includes a complete rewrite of the PackedVec3 transform to achieve this. The key details are: * An internal `__packed_vec3<>` type was added, which corresponds to a `type::Vector` with an additional flag to indicate that it will be emitted as packed vector. * The `PackedVec3` transform replaces all vec3 types used in host-shareable address spaces with the internal `__packed_vec3` type. This includes vec3 types that appear as the store type of a pointer. * When used as an array element, these `__packed_vec3` types are wrapped in a struct that contains a single `__packed_vec3` member. This allows us to add an `@align()` attribute that ensures that `array<vec3<T>>` still has the correct array element stride. * When the `vec3<T>` appears as a struct member in the input program, we apply the `@align()` to that member to ensure that we do not change its offset. * Matrix types with three rows that are used in memory are replaced with an array of columns, where each column uses a `__packed_vec3` inside an aligned wrapper structure as above. * Accesses to host-shareable memory that involve any of these types invoke a "pack" or "unpack" helper function to convert them to the equivalent type that uses `__packed_vec3` or a regular `vec3` as required. * The `chromium_internal_relaxed_uniform_layout` extension is used to avoid issues where modifying a type in the uniform address space triggers stricter layout validation rules. Bug: tint:1571 Fixed: tint:1837 Change-Id: Idaf2da2f5bcb2be00c85ec657edfb614186476bb Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/121200 Reviewed-by: Ben Clayton <bclayton@google.com> Commit-Queue: James Price <jrprice@google.com> Kokoro: Kokoro <noreply+kokoro@google.com>
82 lines
2.3 KiB
Plaintext
82 lines
2.3 KiB
Plaintext
#include <metal_stdlib>
|
|
|
|
using namespace metal;
|
|
|
|
template<typename T, size_t N>
|
|
struct tint_array {
|
|
const constant T& operator[](size_t i) const constant { return elements[i]; }
|
|
device T& operator[](size_t i) device { return elements[i]; }
|
|
const device T& operator[](size_t i) const device { return elements[i]; }
|
|
thread T& operator[](size_t i) thread { return elements[i]; }
|
|
const thread T& operator[](size_t i) const thread { return elements[i]; }
|
|
threadgroup T& operator[](size_t i) threadgroup { return elements[i]; }
|
|
const threadgroup T& operator[](size_t i) const threadgroup { return elements[i]; }
|
|
T elements[N];
|
|
};
|
|
|
|
struct tint_packed_vec3_f32_array_element {
|
|
packed_float3 elements;
|
|
};
|
|
|
|
struct GammaTransferParams {
|
|
float G;
|
|
float A;
|
|
float B;
|
|
float C;
|
|
float D;
|
|
float E;
|
|
float F;
|
|
uint padding;
|
|
};
|
|
|
|
struct ExternalTextureParams_tint_packed_vec3 {
|
|
uint numPlanes;
|
|
uint doYuvToRgbConversionOnly;
|
|
float3x4 yuvToRgbConversionMatrix;
|
|
GammaTransferParams gammaDecodeParams;
|
|
GammaTransferParams gammaEncodeParams;
|
|
tint_array<tint_packed_vec3_f32_array_element, 3> gamutConversionMatrix;
|
|
float3x2 coordTransformationMatrix;
|
|
};
|
|
|
|
struct ExternalTextureParams {
|
|
uint numPlanes;
|
|
uint doYuvToRgbConversionOnly;
|
|
float3x4 yuvToRgbConversionMatrix;
|
|
GammaTransferParams gammaDecodeParams;
|
|
GammaTransferParams gammaEncodeParams;
|
|
float3x3 gamutConversionMatrix;
|
|
float3x2 coordTransformationMatrix;
|
|
};
|
|
|
|
void textureDimensions_cdc6c9(texture2d<float, access::sample> tint_symbol_1) {
|
|
uint2 res = uint2(tint_symbol_1.get_width(), tint_symbol_1.get_height());
|
|
}
|
|
|
|
struct tint_symbol {
|
|
float4 value [[position]];
|
|
};
|
|
|
|
float4 vertex_main_inner(texture2d<float, access::sample> tint_symbol_2) {
|
|
textureDimensions_cdc6c9(tint_symbol_2);
|
|
return float4(0.0f);
|
|
}
|
|
|
|
vertex tint_symbol vertex_main(texture2d<float, access::sample> tint_symbol_3 [[texture(0)]]) {
|
|
float4 const inner_result = vertex_main_inner(tint_symbol_3);
|
|
tint_symbol wrapper_result = {};
|
|
wrapper_result.value = inner_result;
|
|
return wrapper_result;
|
|
}
|
|
|
|
fragment void fragment_main(texture2d<float, access::sample> tint_symbol_4 [[texture(0)]]) {
|
|
textureDimensions_cdc6c9(tint_symbol_4);
|
|
return;
|
|
}
|
|
|
|
kernel void compute_main(texture2d<float, access::sample> tint_symbol_5 [[texture(0)]]) {
|
|
textureDimensions_cdc6c9(tint_symbol_5);
|
|
return;
|
|
}
|
|
|