| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2015 Google Inc. | 2 * Copyright 2015 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 #ifndef GrTargetCommands_DEFINED | 8 #ifndef GrTargetCommands_DEFINED |
| 9 #define GrTargetCommands_DEFINED | 9 #define GrTargetCommands_DEFINED |
| 10 | 10 |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 58 int fMarkerID; | 58 int fMarkerID; |
| 59 CmdType fType; | 59 CmdType fType; |
| 60 }; | 60 }; |
| 61 | 61 |
| 62 void reset(); | 62 void reset(); |
| 63 void flush(GrInOrderDrawBuffer*); | 63 void flush(GrInOrderDrawBuffer*); |
| 64 | 64 |
| 65 private: | 65 private: |
| 66 friend class GrCommandBuilder; | 66 friend class GrCommandBuilder; |
| 67 friend class GrInOrderDrawBuffer; // This goes away when State becomes just
a pipeline | 67 friend class GrInOrderDrawBuffer; // This goes away when State becomes just
a pipeline |
| 68 friend class GrReorderCommandBuilder; |
| 68 | 69 |
| 69 typedef GrGpu::DrawArgs DrawArgs; | 70 typedef GrGpu::DrawArgs DrawArgs; |
| 70 | 71 |
| 71 void recordXferBarrierIfNecessary(const GrPipeline&, GrInOrderDrawBuffer*); | 72 void recordXferBarrierIfNecessary(const GrPipeline&, GrInOrderDrawBuffer*); |
| 72 | 73 |
| 73 // TODO: This can be just a pipeline once paths are in batch, and it should
live elsewhere | 74 // TODO: This can be just a pipeline once paths are in batch, and it should
live elsewhere |
| 74 struct State : public SkNVRefCnt<State> { | 75 struct State : public SkNVRefCnt<State> { |
| 75 // TODO get rid of the prim proc parameter when we use batch everywhere | 76 // TODO get rid of the prim proc parameter when we use batch everywhere |
| 76 State(const GrPrimitiveProcessor* primProc = NULL) | 77 State(const GrPrimitiveProcessor* primProc = NULL) |
| 77 : fPrimitiveProcessor(primProc) | 78 : fPrimitiveProcessor(primProc) |
| (...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 255 | 256 |
| 256 CmdBuffer* cmdBuffer() { return &fCmdBuffer; } | 257 CmdBuffer* cmdBuffer() { return &fCmdBuffer; } |
| 257 GrBatchTarget* batchTarget() { return &fBatchTarget; } | 258 GrBatchTarget* batchTarget() { return &fBatchTarget; } |
| 258 | 259 |
| 259 CmdBuffer fCmdBuffer; | 260 CmdBuffer fCmdBuffer; |
| 260 GrBatchTarget fBatchTarget; | 261 GrBatchTarget fBatchTarget; |
| 261 }; | 262 }; |
| 262 | 263 |
| 263 #endif | 264 #endif |
| 264 | 265 |
| OLD | NEW |