commit 4333323006ac6ef472e011b8ea8f0bb303a0f21f
author bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Feb 02 19:24:54 2011 +0000
committer bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Feb 02 19:24:54 2011 +0000
tree 442ac819bacb63b8954d9bc8d64a6ef1eba41ebf
parent c48b2b330f8bf0e01381e27ca36f48ef5c7d8d5f

Make enabling static rect VB configurable by user config file.

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

gpu/src/GrContext.cpp

diff --git a/gpu/src/GrContext.cpp b/gpu/src/GrContext.cpp
index f966c2c..3446e23 100644
--- a/gpu/src/GrContext.cpp
+++ b/gpu/src/GrContext.cpp
@@ -24,7 +24,6 @@
 #include "GrIndexBuffer.h"

 

 #define DEFER_TEXT_RENDERING 1

-#define USE_STATIC_RECT_VB   0

 

 static const size_t MAX_TEXTURE_CACHE_COUNT = 128;

 static const size_t MAX_TEXTURE_CACHE_BYTES = 8 * 1024 * 1024;

@@ -381,7 +380,7 @@
 

         fGpu->drawNonIndexed(primType, 0, vertCount);

     } else {

-        #if USE_STATIC_RECT_VB

+        #if GR_STATIC_RECT_VB

             fGpu->setVertexSourceToBuffer(fGpu->unitSquareVertexBuffer(), layout);

             GrDrawTarget::AutoViewMatrixRestore avmr(fGpu);

             GrMatrix m;

@@ -428,7 +427,7 @@
 

     this->prepareToDraw(paint);

 

-#if USE_STATIC_RECT_VB

+#if GR_STATIC_RECT_VB

     GrVertexLayout layout = GrDrawTarget::StagePosAsTexCoordVertexLayoutBit(0);

     GrDrawTarget::AutoViewMatrixRestore avmr(fGpu);