First implementation of GrDawnProgramDataManager.
Also add GrDawnCaps to friends of GrShaderCaps, as the other backends do.
Change-Id: Iae60cae7168ad9194f7808c2f51f41de10e53071
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/230747
Commit-Queue: Stephen White <senorblanco@chromium.org>
Reviewed-by: Greg Daniel <egdaniel@google.com>
diff --git a/gn/gpu.gni b/gn/gpu.gni
index 12b1f75..eb01b69 100644
--- a/gn/gpu.gni
+++ b/gn/gpu.gni
@@ -715,6 +715,8 @@
"$_src/gpu/dawn/GrDawnGpu.h",
"$_src/gpu/dawn/GrDawnGpuCommandBuffer.cpp",
"$_src/gpu/dawn/GrDawnGpuCommandBuffer.h",
+ "$_src/gpu/dawn/GrDawnProgramDataManager.cpp",
+ "$_src/gpu/dawn/GrDawnProgramDataManager.h",
"$_src/gpu/dawn/GrDawnRenderTarget.cpp",
"$_src/gpu/dawn/GrDawnRenderTarget.h",
"$_src/gpu/dawn/GrDawnUniformHandler.cpp",
diff --git a/src/gpu/GrShaderCaps.h b/src/gpu/GrShaderCaps.h
index 850865c..6b1725e 100644
--- a/src/gpu/GrShaderCaps.h
+++ b/src/gpu/GrShaderCaps.h
@@ -296,6 +296,7 @@
AdvBlendEqInteraction fAdvBlendEqInteraction;
friend class GrCaps; // For initialization.
+ friend class GrDawnCaps;
friend class GrGLCaps;
friend class GrMockCaps;
friend class GrMtlCaps;
diff --git a/src/gpu/dawn/GrDawnProgramDataManager.cpp b/src/gpu/dawn/GrDawnProgramDataManager.cpp
new file mode 100644
index 0000000..45371f4
--- /dev/null
+++ b/src/gpu/dawn/GrDawnProgramDataManager.cpp
@@ -0,0 +1,278 @@
+/*
+ * Copyright 2019 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "src/gpu/dawn/GrDawnProgramDataManager.h"
+
+#include "src/gpu/dawn/GrDawnGpu.h"
+
+GrDawnProgramDataManager::GrDawnProgramDataManager(const UniformInfoArray& uniforms,
+ uint32_t geometryUniformSize,
+ uint32_t fragmentUniformSize)
+ : fGeometryUniformSize(geometryUniformSize)
+ , fFragmentUniformSize(fragmentUniformSize)
+ , fGeometryUniformsDirty(false)
+ , fFragmentUniformsDirty(false) {
+ fGeometryUniformData.reset(geometryUniformSize);
+ fFragmentUniformData.reset(fragmentUniformSize);
+ int count = uniforms.count();
+ fUniforms.push_back_n(count);
+ // We must add uniforms in same order is the UniformInfoArray so that UniformHandles already
+ // owned by other objects will still match up here.
+ for (int i = 0; i < count; i++) {
+ Uniform& uniform = fUniforms[i];
+ const GrDawnUniformHandler::UniformInfo uniformInfo = uniforms[i];
+ SkDEBUGCODE(
+ uniform.fArrayCount = uniformInfo.fVar.getArrayCount();
+ uniform.fType = uniformInfo.fVar.getType();
+ );
+
+ if (!(kFragment_GrShaderFlag & uniformInfo.fVisibility)) {
+ uniform.fBinding = GrDawnUniformHandler::kGeometryBinding;
+ } else {
+ SkASSERT(kFragment_GrShaderFlag == uniformInfo.fVisibility);
+ uniform.fBinding = GrDawnUniformHandler::kFragBinding;
+ }
+ uniform.fOffset = uniformInfo.fUBOOffset;
+ }
+}
+
+void* GrDawnProgramDataManager::getBufferPtrAndMarkDirty(const Uniform& uni) const {
+ void* buffer;
+ if (GrDawnUniformHandler::kGeometryBinding == uni.fBinding) {
+ buffer = fGeometryUniformData.get();
+ fGeometryUniformsDirty = true;
+ } else {
+ SkASSERT(GrDawnUniformHandler::kFragBinding == uni.fBinding);
+ buffer = fFragmentUniformData.get();
+ fFragmentUniformsDirty = true;
+ }
+ buffer = static_cast<char*>(buffer)+uni.fOffset;
+ return buffer;
+}
+
+void GrDawnProgramDataManager::set1i(UniformHandle u, int32_t i) const {
+ const Uniform& uni = fUniforms[u.toIndex()];
+ void* buffer = this->getBufferPtrAndMarkDirty(uni);
+ memcpy(buffer, &i, sizeof(int32_t));
+}
+
+void GrDawnProgramDataManager::set1iv(UniformHandle u, int arrayCount, const int32_t v[]) const {
+ const Uniform& uni = fUniforms[u.toIndex()];
+ uint32_t* buffer = static_cast<uint32_t*>(this->getBufferPtrAndMarkDirty(uni));
+ for (int i = 0; i < arrayCount; ++i) {
+ const int32_t* curVec = &v[i];
+ memcpy(buffer, curVec, sizeof(int32_t));
+ buffer += 4;
+ }
+}
+
+void GrDawnProgramDataManager::set2i(UniformHandle u, int32_t i0, int32_t i1) const {
+ const Uniform& uni = fUniforms[u.toIndex()];
+ void* buffer = this->getBufferPtrAndMarkDirty(uni);
+ int32_t v[2] = { i0, i1 };
+ memcpy(buffer, v, 2 * sizeof(int32_t));
+}
+
+void GrDawnProgramDataManager::set2iv(UniformHandle u, int arrayCount, const int32_t v[]) const {
+ const Uniform& uni = fUniforms[u.toIndex()];
+ uint32_t* buffer = static_cast<uint32_t*>(this->getBufferPtrAndMarkDirty(uni));
+ for (int i = 0; i < arrayCount; ++i) {
+ const int32_t* curVec = &v[2 * i];
+ memcpy(buffer, curVec, 2 * sizeof(int32_t));
+ buffer += 4;
+ }
+}
+
+void GrDawnProgramDataManager::set3i(UniformHandle u, int32_t i0, int32_t i1, int32_t i2) const {
+ const Uniform& uni = fUniforms[u.toIndex()];
+ void* buffer = this->getBufferPtrAndMarkDirty(uni);
+ int32_t v[3] = { i0, i1, i2 };
+ memcpy(buffer, v, 3 * sizeof(int32_t));
+}
+
+void GrDawnProgramDataManager::set3iv(UniformHandle u, int arrayCount, const int32_t v[]) const {
+ const Uniform& uni = fUniforms[u.toIndex()];
+ uint32_t* buffer = static_cast<uint32_t*>(this->getBufferPtrAndMarkDirty(uni));
+ for (int i = 0; i < arrayCount; ++i) {
+ const int32_t* curVec = &v[3 * i];
+ memcpy(buffer, curVec, 3 * sizeof(int32_t));
+ buffer += 4;
+ }
+}
+
+void GrDawnProgramDataManager::set4i(UniformHandle u,
+ int32_t i0,
+ int32_t i1,
+ int32_t i2,
+ int32_t i3) const {
+ const Uniform& uni = fUniforms[u.toIndex()];
+ void* buffer = this->getBufferPtrAndMarkDirty(uni);
+ int32_t v[4] = { i0, i1, i2, i3 };
+ memcpy(buffer, v, sizeof(v));
+}
+
+void GrDawnProgramDataManager::set4iv(UniformHandle u, int arrayCount, const int32_t v[]) const {
+ const Uniform& uni = fUniforms[u.toIndex()];
+ uint32_t* buffer = static_cast<uint32_t*>(this->getBufferPtrAndMarkDirty(uni));
+ for (int i = 0; i < arrayCount; ++i) {
+ const int32_t* curVec = &v[4 * i];
+ memcpy(buffer, curVec, 4 * sizeof(int32_t));
+ buffer += 4;
+ }
+}
+
+void GrDawnProgramDataManager::set1f(UniformHandle u, float v0) const {
+ const Uniform& uni = fUniforms[u.toIndex()];
+ void* buffer = this->getBufferPtrAndMarkDirty(uni);
+ memcpy(buffer, &v0, sizeof(float));
+}
+
+void GrDawnProgramDataManager::set1fv(UniformHandle u, int arrayCount, const float v[]) const {
+ const Uniform& uni = fUniforms[u.toIndex()];
+ void* buffer = this->getBufferPtrAndMarkDirty(uni);
+ for (int i = 0; i < arrayCount; ++i) {
+ const float* curVec = &v[i];
+ memcpy(buffer, curVec, sizeof(float));
+ buffer = static_cast<char*>(buffer) + 4*sizeof(float);
+ }
+}
+
+void GrDawnProgramDataManager::set2f(UniformHandle u, float v0, float v1) const {
+ const Uniform& uni = fUniforms[u.toIndex()];
+ void* buffer = this->getBufferPtrAndMarkDirty(uni);
+ float v[2] = { v0, v1 };
+ memcpy(buffer, v, 2 * sizeof(float));
+}
+
+void GrDawnProgramDataManager::set2fv(UniformHandle u, int arrayCount, const float v[]) const {
+ const Uniform& uni = fUniforms[u.toIndex()];
+ void* buffer = this->getBufferPtrAndMarkDirty(uni);
+ for (int i = 0; i < arrayCount; ++i) {
+ const float* curVec = &v[2 * i];
+ memcpy(buffer, curVec, 2 * sizeof(float));
+ buffer = static_cast<char*>(buffer) + 4*sizeof(float);
+ }
+}
+
+void GrDawnProgramDataManager::set3f(UniformHandle u, float v0, float v1, float v2) const {
+ const Uniform& uni = fUniforms[u.toIndex()];
+ void* buffer = this->getBufferPtrAndMarkDirty(uni);
+ float v[3] = { v0, v1, v2 };
+ memcpy(buffer, v, 3 * sizeof(float));
+}
+
+void GrDawnProgramDataManager::set3fv(UniformHandle u, int arrayCount, const float v[]) const {
+ const Uniform& uni = fUniforms[u.toIndex()];
+ void* buffer = this->getBufferPtrAndMarkDirty(uni);
+ for (int i = 0; i < arrayCount; ++i) {
+ const float* curVec = &v[3 * i];
+ memcpy(buffer, curVec, 3 * sizeof(float));
+ buffer = static_cast<char*>(buffer) + 4*sizeof(float);
+ }
+}
+
+void GrDawnProgramDataManager::set4f(UniformHandle u,
+ float v0,
+ float v1,
+ float v2,
+ float v3) const {
+ const Uniform& uni = fUniforms[u.toIndex()];
+ void* buffer = this->getBufferPtrAndMarkDirty(uni);
+ float v[4] = { v0, v1, v2, v3 };
+ memcpy(buffer, v, 4 * sizeof(float));
+}
+
+void GrDawnProgramDataManager::set4fv(UniformHandle u, int arrayCount, const float v[]) const {
+ const Uniform& uni = fUniforms[u.toIndex()];
+ void* buffer = this->getBufferPtrAndMarkDirty(uni);
+ memcpy(buffer, v, arrayCount * 4 * sizeof(float));
+}
+
+void GrDawnProgramDataManager::setMatrix2f(UniformHandle u, const float matrix[]) const {
+ this->setMatrices<2>(u, 1, matrix);
+}
+
+void GrDawnProgramDataManager::setMatrix2fv(UniformHandle u,
+ int arrayCount,
+ const float m[]) const {
+ this->setMatrices<2>(u, arrayCount, m);
+}
+
+void GrDawnProgramDataManager::setMatrix3f(UniformHandle u, const float matrix[]) const {
+ this->setMatrices<3>(u, 1, matrix);
+}
+
+void GrDawnProgramDataManager::setMatrix3fv(UniformHandle u,
+ int arrayCount,
+ const float m[]) const {
+ this->setMatrices<3>(u, arrayCount, m);
+}
+
+void GrDawnProgramDataManager::setMatrix4f(UniformHandle u, const float matrix[]) const {
+ this->setMatrices<4>(u, 1, matrix);
+}
+
+void GrDawnProgramDataManager::setMatrix4fv(UniformHandle u,
+ int arrayCount,
+ const float m[]) const {
+ this->setMatrices<4>(u, arrayCount, m);
+}
+
+template<int N> struct set_uniform_matrix;
+
+template<int N> inline void GrDawnProgramDataManager::setMatrices(UniformHandle u,
+ int arrayCount,
+ const float matrices[]) const {
+ const Uniform& uni = fUniforms[u.toIndex()];
+ void* buffer;
+ if (GrDawnUniformHandler::kGeometryBinding == uni.fBinding) {
+ buffer = fGeometryUniformData.get();
+ fGeometryUniformsDirty = true;
+ } else {
+ SkASSERT(GrDawnUniformHandler::kFragBinding == uni.fBinding);
+ buffer = fFragmentUniformData.get();
+ fFragmentUniformsDirty = true;
+ }
+
+ set_uniform_matrix<N>::set(buffer, uni.fOffset, arrayCount, matrices);
+}
+
+template<int N> struct set_uniform_matrix {
+ 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));
+ buffer = static_cast<char*>(buffer) + 4 * sizeof(float);
+ }
+ }
+ }
+};
+
+template<> struct set_uniform_matrix<4> {
+ 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 * 16 * sizeof(float));
+ }
+};
+
+void GrDawnProgramDataManager::uploadUniformBuffers(dawn::Buffer geometryBuffer,
+ dawn::Buffer fragmentBuffer) const {
+ if (geometryBuffer && fGeometryUniformsDirty) {
+ geometryBuffer.SetSubData(0, fGeometryUniformSize,
+ static_cast<const uint8_t*>(fGeometryUniformData.get()));
+ fGeometryUniformsDirty = false;
+ }
+ if (fragmentBuffer && fFragmentUniformsDirty) {
+ fragmentBuffer.SetSubData(0, fFragmentUniformSize,
+ static_cast<const uint8_t*>(fFragmentUniformData.get()));
+ fFragmentUniformsDirty = false;
+ }
+}
diff --git a/src/gpu/dawn/GrDawnProgramDataManager.h b/src/gpu/dawn/GrDawnProgramDataManager.h
new file mode 100644
index 0000000..0b2f35e
--- /dev/null
+++ b/src/gpu/dawn/GrDawnProgramDataManager.h
@@ -0,0 +1,88 @@
+/*
+ * Copyright 2019 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrDawnProgramDataManager_DEFINED
+#define GrDawnProgramDataManager_DEFINED
+
+#include "src/gpu/dawn/GrDawnUniformHandler.h"
+#include "src/gpu/glsl/GrGLSLProgramDataManager.h"
+#include "dawn/dawncpp.h"
+
+#include "src/core/SkAutoMalloc.h"
+
+class GrDawnGpu;
+class GrDawnUniformBuffer;
+
+class GrDawnProgramDataManager : public GrGLSLProgramDataManager {
+public:
+ typedef GrDawnUniformHandler::UniformInfoArray UniformInfoArray;
+
+ GrDawnProgramDataManager(const UniformInfoArray&,
+ uint32_t geometryUniformSize,
+ uint32_t fragmentUniformSize);
+
+ void set1i(UniformHandle, int32_t) const override;
+ void set1iv(UniformHandle, int arrayCount, const int32_t v[]) const override;
+ void set2i(UniformHandle, int32_t, int32_t) const override;
+ void set2iv(UniformHandle, int arrayCount, const int32_t v[]) const override;
+ void set3i(UniformHandle, int32_t, int32_t, int32_t) const override;
+ void set3iv(UniformHandle, int arrayCount, const int32_t v[]) const override;
+ void set4i(UniformHandle, int32_t, int32_t, int32_t, int32_t) const override;
+ void set4iv(UniformHandle, int arrayCount, const int32_t v[]) const override;
+
+ void set1f(UniformHandle, float v0) const override;
+ void set1fv(UniformHandle, int arrayCount, const float v[]) const override;
+ void set2f(UniformHandle, float, float) const override;
+ void set2fv(UniformHandle, int arrayCount, const float v[]) const override;
+ void set3f(UniformHandle, float, float, float) const override;
+ void set3fv(UniformHandle, int arrayCount, const float v[]) const override;
+ void set4f(UniformHandle, float, float, float, float) const override;
+ void set4fv(UniformHandle, int arrayCount, const float v[]) const override;
+ // matrices are column-major, the first two upload a single matrix, the latter two upload
+ // arrayCount matrices into a uniform array.
+ void setMatrix2f(UniformHandle, const float matrix[]) const override;
+ void setMatrix3f(UniformHandle, const float matrix[]) const override;
+ void setMatrix4f(UniformHandle, const float matrix[]) const override;
+ void setMatrix2fv(UniformHandle, int arrayCount, const float matrices[]) const override;
+ void setMatrix3fv(UniformHandle, int arrayCount, const float matrices[]) const override;
+ void setMatrix4fv(UniformHandle, int arrayCount, const float matrices[]) const override;
+
+ // for nvpr only
+ void setPathFragmentInputTransform(VaryingHandle u, int components,
+ const SkMatrix& matrix) const override {
+ SK_ABORT("Only supported in NVPR, which is not in Dawn");
+ }
+
+ void uploadUniformBuffers(dawn::Buffer geometryBuffer, dawn::Buffer fragmentBuffer) const;
+
+private:
+ struct Uniform {
+ uint32_t fBinding;
+ uint32_t fOffset;
+ SkDEBUGCODE(
+ GrSLType fType;
+ int fArrayCount;
+ );
+ };
+
+ template<int N> inline void setMatrices(UniformHandle, int arrayCount,
+ const float matrices[]) const;
+
+ void* getBufferPtrAndMarkDirty(const Uniform& uni) const;
+
+ uint32_t fGeometryUniformSize;
+ uint32_t fFragmentUniformSize;
+
+ SkTArray<Uniform, true> fUniforms;
+
+ mutable SkAutoMalloc fGeometryUniformData;
+ mutable SkAutoMalloc fFragmentUniformData;
+ mutable bool fGeometryUniformsDirty;
+ mutable bool fFragmentUniformsDirty;
+};
+
+#endif
