Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(18)

Unified Diff: tests/GLProgramsTest.cpp

Issue 543623004: Removing vertex attrib indices (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: cleanup Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: tests/GLProgramsTest.cpp
diff --git a/tests/GLProgramsTest.cpp b/tests/GLProgramsTest.cpp
index a641fe2314aa7b092ec5d9ba6917a260d5ddf1d2..b41f89e6d04f49f9b4192c0a273f9a07a91b4bb5 100644
--- a/tests/GLProgramsTest.cpp
+++ b/tests/GLProgramsTest.cpp
@@ -197,7 +197,6 @@ bool GrGpuGL::programUnitTest(int maxStages) {
int currAttribIndex = 1; // we need to always leave room for position
int currTextureCoordSet = 0;
- int attribIndices[2] = { 0, 0 };
GrTexture* dummyTextures[] = {dummyTexture1.get(), dummyTexture2.get()};
int numStages = random.nextULessThan(maxStages + 1);
@@ -211,7 +210,7 @@ bool GrGpuGL::programUnitTest(int maxStages) {
random.nextBool();
SkAutoTDelete<GrEffectStage> geometryProcessor;
- bool hasGeometryProcessor = useFixedFunctionPathRendering ? false : random.nextBool();
+ /*bool hasGeometryProcessor = useFixedFunctionPathRendering ? false : random.nextBool();
if (hasGeometryProcessor) {
while (true) {
SkAutoTUnref<const GrEffect> effect(GrEffectTestFactory::CreateStage(
@@ -226,16 +225,12 @@ bool GrGpuGL::programUnitTest(int maxStages) {
continue;
}
- int numAttribs = effect->numVertexAttribs();
- for (int i = 0; i < numAttribs; ++i) {
- attribIndices[i] = currAttribIndex++;
- }
GrEffectStage* stage = SkNEW_ARGS(GrEffectStage,
- (effect.get(), attribIndices[0], attribIndices[1]));
+ (effect.get()));
geometryProcessor.reset(stage);
break;
}
- }
+ }*/
for (int s = 0; s < numStages;) {
SkAutoTUnref<const GrEffect> effect(GrEffectTestFactory::CreateStage(
&random,
@@ -259,7 +254,7 @@ bool GrGpuGL::programUnitTest(int maxStages) {
currTextureCoordSet += numTransforms;
}
GrEffectStage* stage = SkNEW_ARGS(GrEffectStage,
- (effect.get(), attribIndices[0], attribIndices[1]));
+ (effect.get()));
stages[s] = stage;
++s;
« include/gpu/GrShaderVar.h ('K') | « src/gpu/gl/builders/GrGLVertexShaderBuilder.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698