commit 471d471dcd7422e5dd9c822c1092b2ba4721dcfe
author bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Aug 23 15:45:25 2011 +0000
committer bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Aug 23 15:45:25 2011 +0000
tree baba8bd0f6e127a3b346f305f3e4b48dd4c84735
parent 00245c94cd25dcff96fa8d54849327dc7f7f2852

Correctly determine whether HW AA lines can be used
Review URL: http://codereview.appspot.com/4937049/



git-svn-id: http://skia.googlecode.com/svn/trunk@2162 2bbb7eff-a529-9590-31e7-b0007b416f81

gpu/src/GrContext.cpp

diff --git a/gpu/src/GrContext.cpp b/gpu/src/GrContext.cpp
index 9c3f298..7bac3ba 100644
--- a/gpu/src/GrContext.cpp
+++ b/gpu/src/GrContext.cpp
@@ -630,16 +630,16 @@
     GrClip                         fClip;
 };
 
-bool GrContext::doOffscreenAA(GrDrawTarget* target, 
+bool GrContext::doOffscreenAA(GrDrawTarget* target,
                               const GrPaint& paint,
-                              bool isLines) const {
+                              bool isHairLines) const {
 #if !GR_USE_OFFSCREEN_AA
     return false;
 #else
     if (!paint.fAntiAlias) {
         return false;
     }
-    if (isLines && fGpu->supportsAALines()) {
+    if (isHairLines && target->willUseHWAALines()) {
         return false;
     }
     if (target->getRenderTarget()->isMultisampled()) {
@@ -1114,7 +1114,6 @@
 }
 
 static bool apply_aa_to_rect(GrDrawTarget* target,
-                             GrGpu* gpu,
                              const GrPaint& paint,
                              const GrRect& rect,
                              GrScalar width, 
@@ -1134,7 +1133,7 @@
         return false;
     }
 
-    if (0 == width && gpu->supportsAALines()) {
+    if (0 == width && target->willUseHWAALines()) {
         return false;
     }
 
@@ -1174,7 +1173,7 @@
 
     GrRect devRect = rect;
     GrMatrix combinedMatrix;
-    bool doAA = apply_aa_to_rect(target, fGpu, paint, rect, width, matrix, 
+    bool doAA = apply_aa_to_rect(target, paint, rect, width, matrix, 
                                  &combinedMatrix, &devRect);
 
     if (doAA) {
@@ -1769,7 +1768,8 @@
                                    DRAW_BUFFER_IBPOOL_BUFFER_SIZE,
                                    DRAW_BUFFER_IBPOOL_PREALLOC_BUFFERS);
 
-    fDrawBuffer = new GrInOrderDrawBuffer(fDrawBufferVBAllocPool,
+    fDrawBuffer = new GrInOrderDrawBuffer(fGpu,
+                                          fDrawBufferVBAllocPool,
                                           fDrawBufferIBAllocPool);
 #endif