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

Cleanup: replace helper with SkTAddOffset.

Browse Source 
I had forgotten this helper existed.

Change-Id: Ic90c9ec9d338c8feb16db2d7fb68bc8ef3ed74c2
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/466442
Auto-Submit: John Stiles <johnstiles@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>
This commit is contained in:
John Stiles 2021-11-01 14:55:53 -04:00 committed by SkCQ
parent a5caedd0e2
commit 5743812354
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/gpu/GrUniformDataManager.cpp
View File

@ -76,10 +76,6 @@ int GrUniformDataManager::copyUniforms(void* dest,
return 4;
}
static void* advance_buffer(void* buffer, int numUniforms, int uniformSize) {
return static_cast<char*>(buffer) + (uniformSize * numUniforms);
}
template <int N, GrSLType FullType, GrSLType HalfType>
void GrUniformDataManager::set(UniformHandle u, const void* v) const {
const Uniform& uni = fUniforms[u.toIndex()];
@ -103,7 +99,7 @@ void GrUniformDataManager::setv(UniformHandle u, int arrayCount, const void* v)
} else {
for (int i = 0; i < arrayCount; ++i) {
int uniformSize = this->copyUniforms(buffer, v, N, uni.fType);
buffer = advance_buffer(buffer, /*numUniforms=*/4, uniformSize);
buffer = SkTAddOffset<void>(buffer, /*numUniforms*/4 * uniformSize);
v = static_cast<const char*>(v) + N * 4;
}
}
@ -248,7 +244,7 @@ inline void GrUniformDataManager::setMatrices(UniformHandle u,
const float* matrix = &matrices[N * N * i];
for (int j = 0; j < N; ++j) {
int uniformSize = this->copyUniforms(buffer, &matrix[j * N], N, uni.fType);
buffer = advance_buffer(buffer, /*numUniforms=*/4, uniformSize);
buffer = SkTAddOffset<void>(buffer, /*numUniforms*/4 * uniformSize);
}
}
}