changed vertex attribute precisions to be actual types
Bug: skia:
Change-Id: Ic5555d9f1be7f24655bdea9f2a3677bfb128ef70
Reviewed-on: https://skia-review.googlesource.com/50221
Reviewed-by: Chris Dalton <csmartdalton@google.com>
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
diff --git a/tests/GrMeshTest.cpp b/tests/GrMeshTest.cpp
index 223138b..1ae3926 100644
--- a/tests/GrMeshTest.cpp
+++ b/tests/GrMeshTest.cpp
@@ -285,14 +285,14 @@
, fVertex(nullptr)
, fColor(nullptr) {
if (instanced) {
- fInstanceLocation = &this->addInstanceAttrib("location", kVec2f_GrVertexAttribType);
+ fInstanceLocation = &this->addInstanceAttrib("location", kHalf2_GrVertexAttribType);
if (hasVertexBuffer) {
- fVertex = &this->addVertexAttrib("vertex", kVec2f_GrVertexAttribType);
+ fVertex = &this->addVertexAttrib("vertex", kHalf2_GrVertexAttribType);
}
- fColor = &this->addInstanceAttrib("color", kVec4ub_GrVertexAttribType);
+ fColor = &this->addInstanceAttrib("color", kUByte4_norm_GrVertexAttribType);
} else {
- fVertex = &this->addVertexAttrib("vertex", kVec2f_GrVertexAttribType);
- fColor = &this->addVertexAttrib("color", kVec4ub_GrVertexAttribType);
+ fVertex = &this->addVertexAttrib("vertex", kHalf2_GrVertexAttribType);
+ fColor = &this->addVertexAttrib("color", kUByte4_norm_GrVertexAttribType);
}
this->initClassID<GrMeshTestProcessor>();
}
diff --git a/tests/GrPipelineDynamicStateTest.cpp b/tests/GrPipelineDynamicStateTest.cpp
index 475f8f3..4b8621d 100644
--- a/tests/GrPipelineDynamicStateTest.cpp
+++ b/tests/GrPipelineDynamicStateTest.cpp
@@ -59,8 +59,8 @@
class GrPipelineDynamicStateTestProcessor : public GrGeometryProcessor {
public:
GrPipelineDynamicStateTestProcessor()
- : fVertex(this->addVertexAttrib("vertex", kVec2f_GrVertexAttribType))
- , fColor(this->addVertexAttrib("color", kVec4ub_GrVertexAttribType)) {
+ : fVertex(this->addVertexAttrib("vertex", kHalf2_GrVertexAttribType))
+ , fColor(this->addVertexAttrib("color", kUByte4_norm_GrVertexAttribType)) {
this->initClassID<GrPipelineDynamicStateTestProcessor>();
}
diff --git a/tests/PrimitiveProcessorTest.cpp b/tests/PrimitiveProcessorTest.cpp
index 6402020..8898e35 100644
--- a/tests/PrimitiveProcessorTest.cpp
+++ b/tests/PrimitiveProcessorTest.cpp
@@ -60,7 +60,7 @@
fAttribNames.push_back().printf("attr%d", i);
}
for (auto i = 0; i < numAttribs; ++i) {
- this->addVertexAttrib(fAttribNames[i].c_str(), kVec2f_GrVertexAttribType);
+ this->addVertexAttrib(fAttribNames[i].c_str(), kFloat2_GrVertexAttribType);
}
}
const char* name() const override { return "Dummy GP"; }