| 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 | 8 |
| 9 #include "GrGLGpu.h" | 9 #include "GrGLGpu.h" |
| 10 #include "GrGLStencilAttachment.h" | 10 #include "GrGLStencilAttachment.h" |
| (...skipping 2709 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2720 if(!SkIRect::IntersectsNoEmptyCheck(dstRect, srcRect)) { | 2720 if(!SkIRect::IntersectsNoEmptyCheck(dstRect, srcRect)) { |
| 2721 return true; | 2721 return true; |
| 2722 } | 2722 } |
| 2723 } else { | 2723 } else { |
| 2724 return true; | 2724 return true; |
| 2725 } | 2725 } |
| 2726 } | 2726 } |
| 2727 return false; | 2727 return false; |
| 2728 } | 2728 } |
| 2729 | 2729 |
| 2730 void GrGLGpu::xferBarrier(GrXferBarrierType type) { |
| 2731 switch (type) { |
| 2732 case kTexture_GrXferBarrierType: |
| 2733 SkASSERT(this->caps()->textureBarrierSupport()); |
| 2734 GL_CALL(TextureBarrier()); |
| 2735 return; |
| 2736 } |
| 2737 } |
| 2738 |
| 2730 void GrGLGpu::didAddGpuTraceMarker() { | 2739 void GrGLGpu::didAddGpuTraceMarker() { |
| 2731 if (this->caps()->gpuTracingSupport()) { | 2740 if (this->caps()->gpuTracingSupport()) { |
| 2732 const GrTraceMarkerSet& markerArray = this->getActiveTraceMarkers(); | 2741 const GrTraceMarkerSet& markerArray = this->getActiveTraceMarkers(); |
| 2733 SkString markerString = markerArray.toStringLast(); | 2742 SkString markerString = markerArray.toStringLast(); |
| 2734 #if GR_FORCE_GPU_TRACE_DEBUGGING | 2743 #if GR_FORCE_GPU_TRACE_DEBUGGING |
| 2735 SkDebugf("%s\n", markerString.c_str()); | 2744 SkDebugf("%s\n", markerString.c_str()); |
| 2736 #else | 2745 #else |
| 2737 GL_CALL(PushGroupMarker(0, markerString.c_str())); | 2746 GL_CALL(PushGroupMarker(0, markerString.c_str())); |
| 2738 #endif | 2747 #endif |
| 2739 } | 2748 } |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2775 this->setVertexArrayID(gpu, 0); | 2784 this->setVertexArrayID(gpu, 0); |
| 2776 } | 2785 } |
| 2777 int attrCount = gpu->glCaps().maxVertexAttributes(); | 2786 int attrCount = gpu->glCaps().maxVertexAttributes(); |
| 2778 if (fDefaultVertexArrayAttribState.count() != attrCount) { | 2787 if (fDefaultVertexArrayAttribState.count() != attrCount) { |
| 2779 fDefaultVertexArrayAttribState.resize(attrCount); | 2788 fDefaultVertexArrayAttribState.resize(attrCount); |
| 2780 } | 2789 } |
| 2781 attribState = &fDefaultVertexArrayAttribState; | 2790 attribState = &fDefaultVertexArrayAttribState; |
| 2782 } | 2791 } |
| 2783 return attribState; | 2792 return attribState; |
| 2784 } | 2793 } |
| OLD | NEW |