remove drawtype

tests/GLProgramsTest.cpp

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 // This is a GPU-backend specific test. It relies on static intializers to work
 
@@ skipping 254 matching lines @@
             SkDebugf("Could not allocate render target");
             return false;
         }
 
         GrDrawState ds;
         ds.setRenderTarget(rt.get());
 
         // if path rendering we have to setup a couple of things like the draw type
         bool usePathRendering = gpu->glCaps().pathRenderingSupport() && random.nextBool();
 
-        GrGpu::DrawType drawType = usePathRendering ? GrGpu::kDrawPath_DrawType :
-                                                      GrGpu::kDrawPoints_DrawType;
-
         // twiddle drawstate knobs randomly
         bool hasGeometryProcessor = !usePathRendering;
         SkAutoTUnref<const GrGeometryProcessor> gp;
         SkAutoTUnref<const GrPathProcessor> pathProc;
         if (hasGeometryProcessor) {
             gp.reset(get_random_gp(fContext, gpu->glCaps(), &random, dummyTextures));
         } else {
             pathProc.reset(GrPathProcessor::Create(GrColor_WHITE));
         }
         set_random_color_coverage_stages(gpu,
@@ skipping 25 matching lines @@
         // create optimized draw state, setup readDst texture if required, and build a descriptor
         // and program.  ODS creation can fail, so we have to check
         GrOptDrawState ods(ds, primProc, *gpu->caps(), scissor, &dstCopy);
         if (ods.mustSkip()) {
             continue;
         }
         GrBatchTracker bt;
         primProc->initBatchTracker(&bt, ods.getInitBatchTracker());
 
         GrProgramDesc desc;
-        gpu->buildProgramDesc(&desc, *primProc, ods, ods.descInfo(), drawType, bt);
+        gpu->buildProgramDesc(&desc, *primProc, ods, ods.descInfo(), bt);
 
-        GrGpu::DrawArgs args(primProc, &ods, &desc, &bt, drawType);
+        GrGpu::DrawArgs args(primProc, &ods, &desc, &bt);
         SkAutoTUnref<GrGLProgram> program(GrGLProgramBuilder::CreateProgram(args, gpu));
 
         if (NULL == program.get()) {
             SkDebugf("Failed to create program!");
             return false;
         }
 
         // because occasionally optimized drawstate creation will fail for valid reasons, we only
         // want to increment on success
         ++t;
@@ skipping 29 matching lines @@
             }
 #endif
             GrTestTarget target;
             context->getTestTarget(&target);
             REPORTER_ASSERT(reporter, target.target()->programUnitTest(maxStages));
         }
     }
 }
 
 #endif