AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix matrix layout in Metal.

Browse Source 
2x2 matrices are packed tightly, 3x3 have a pad of float at the end
of each row.

Bug: skia:8243
Change-Id: I07c3d051643aed13e37bc52a13cdd67a3728d71b
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/214364
Reviewed-by: Greg Daniel <egdaniel@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Jim Van Verth <jvanverth@google.com>
This commit is contained in:
Jim Van Verth 2019-05-17 14:53:04 -04:00 committed by Skia Commit-Bot
parent b1e4a4e438
commit bb66ac1e5e
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/gpu/mtl/GrMtlPipelineStateDataManager.mm
View File

@ -322,14 +322,22 @@ template<int N> inline void GrMtlPipelineStateDataManager::setMatrices(
set_uniform_matrix<N>::set(buffer, uni.fOffset, arrayCount, matrices);
}
template<int N> struct set_uniform_matrix {
template<> struct set_uniform_matrix<2> {
inline static void set(void* buffer, int uniformOffset, int count, const float matrices[]) {
GR_STATIC_ASSERT(sizeof(float) == 4);
buffer = static_cast<char*>(buffer) + uniformOffset;
memcpy(buffer, matrices, count * 4 * sizeof(float));
}
};
template<> struct set_uniform_matrix<3> {
inline static void set(void* buffer, int uniformOffset, int count, const float matrices[]) {
GR_STATIC_ASSERT(sizeof(float) == 4);
buffer = static_cast<char*>(buffer) + uniformOffset;
for (int i = 0; i < count; ++i) {
const float* matrix = &matrices[N * N * i];
for (int j = 0; j < N; ++j) {
memcpy(buffer, &matrix[j * N], N * sizeof(float));
const float* matrix = &matrices[3 * 3 * i];
for (int j = 0; j < 3; ++j) {
memcpy(buffer, &matrix[j * 3], 3 * sizeof(float));
buffer = static_cast<char*>(buffer) + 4 * sizeof(float);
}
}

3
src/gpu/mtl/GrMtlUniformHandler.mm
View File

@ -148,8 +148,7 @@ static inline uint32_t grsltype_to_mtl_size(GrSLType type) {
return 4 * sizeof(int32_t);
case kHalf2x2_GrSLType: // fall through
case kFloat2x2_GrSLType:
//TODO: this will be 4 * szof(float) on std430.
return 8 * sizeof(float);
return 4 * sizeof(float);
case kHalf3x3_GrSLType: // fall through
case kFloat3x3_GrSLType:
return 12 * sizeof(float);