| OLD | NEW | 
|---|
| 1 /* | 1 /* | 
| 2  * Copyright 2011 Google Inc. | 2  * Copyright 2011 Google Inc. | 
| 3  * | 3  * | 
| 4  * Use of this source code is governed by a BSD-style license that can be | 4  * Use of this source code is governed by a BSD-style license that can be | 
| 5  * found in the LICENSE file. | 5  * found in the LICENSE file. | 
| 6  */ | 6  */ | 
| 7 | 7 | 
| 8 #include "GrInOrderDrawBuffer.h" | 8 #include "GrInOrderDrawBuffer.h" | 
| 9 | 9 | 
| 10 // We will use the reordering buffer, unless we have NVPR. | 10 // We will use the reordering buffer, unless we have NVPR. | 
| 11 // TODO move NVPR to batch so we can reorder | 11 // TODO move NVPR to batch so we can reorder | 
| 12 static inline bool allow_reordering(const GrGpu* gpu) { | 12 static inline bool allow_reordering(const GrGpu* gpu) { | 
| 13     const GrCaps* caps = gpu->caps(); | 13     //const GrCaps* caps = gpu->caps(); | 
| 14     return caps && caps->shaderCaps() && !caps->shaderCaps()->pathRenderingSuppo
     rt(); | 14     //return caps && caps->shaderCaps() && !caps->shaderCaps()->pathRenderingSup
     port(); | 
|  | 15     return false; | 
| 15 } | 16 } | 
| 16 | 17 | 
| 17 GrInOrderDrawBuffer::GrInOrderDrawBuffer(GrContext* context) | 18 GrInOrderDrawBuffer::GrInOrderDrawBuffer(GrContext* context) | 
| 18     : INHERITED(context) | 19     : INHERITED(context) | 
| 19     , fCommands(GrCommandBuilder::Create(context->getGpu(), allow_reordering(con
     text->getGpu()))) | 20     , fCommands(GrCommandBuilder::Create(context->getGpu(), allow_reordering(con
     text->getGpu()))) | 
| 20     , fPathIndexBuffer(kPathIdxBufferMinReserve * sizeof(char)/4) | 21     , fPathIndexBuffer(kPathIdxBufferMinReserve * sizeof(char)/4) | 
| 21     , fPathTransformBuffer(kPathXformBufferMinReserve * sizeof(float)/4) | 22     , fPathTransformBuffer(kPathXformBufferMinReserve * sizeof(float)/4) | 
| 22     , fPipelineBuffer(kPipelineBufferMinReserve) | 23     , fPipelineBuffer(kPipelineBufferMinReserve) | 
| 23     , fDrawID(0) { | 24     , fDrawID(0) { | 
| 24 } | 25 } | 
| (...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 194         fPrevState->getPipeline()->isEqual(*state->getPipeline())) { | 195         fPrevState->getPipeline()->isEqual(*state->getPipeline())) { | 
| 195         this->unallocState(state); | 196         this->unallocState(state); | 
| 196     } else { | 197     } else { | 
| 197         fPrevState.reset(state); | 198         fPrevState.reset(state); | 
| 198     } | 199     } | 
| 199 | 200 | 
| 200     this->recordTraceMarkersIfNecessary( | 201     this->recordTraceMarkersIfNecessary( | 
| 201             fCommands->recordXferBarrierIfNecessary(*fPrevState->getPipeline(), 
     *this->caps())); | 202             fCommands->recordXferBarrierIfNecessary(*fPrevState->getPipeline(), 
     *this->caps())); | 
| 202     return fPrevState; | 203     return fPrevState; | 
| 203 } | 204 } | 
| OLD | NEW | 
|---|