Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(313)

Side by Side Diff: src/gpu/gl/GrGLGpu.cpp

Issue 1133123009: rename GrDrawTargetCaps to GrCaps (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: fix gypi filename Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « src/gpu/gl/GrGLCaps.cpp ('k') | tests/GLProgramsTest.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 2784 matching lines...) Expand 10 before | Expand all | Expand 10 after
2795 // The render target uses separate storage so no need for glText ureBarrier. 2795 // The render target uses separate storage so no need for glText ureBarrier.
2796 // FIXME: The render target will resolve automatically when its texture is bound, 2796 // FIXME: The render target will resolve automatically when its texture is bound,
2797 // but we could resolve only the bounds that will be read if we do it here instead. 2797 // but we could resolve only the bounds that will be read if we do it here instead.
2798 return; 2798 return;
2799 } 2799 }
2800 SkASSERT(this->caps()->textureBarrierSupport()); 2800 SkASSERT(this->caps()->textureBarrierSupport());
2801 GL_CALL(TextureBarrier()); 2801 GL_CALL(TextureBarrier());
2802 return; 2802 return;
2803 } 2803 }
2804 case kBlend_GrXferBarrierType: 2804 case kBlend_GrXferBarrierType:
2805 SkASSERT(GrDrawTargetCaps::kAdvanced_BlendEquationSupport == 2805 SkASSERT(GrCaps::kAdvanced_BlendEquationSupport ==
2806 this->caps()->blendEquationSupport()); 2806 this->caps()->blendEquationSupport());
2807 GL_CALL(BlendBarrier()); 2807 GL_CALL(BlendBarrier());
2808 return; 2808 return;
2809 } 2809 }
2810 } 2810 }
2811 2811
2812 void GrGLGpu::didAddGpuTraceMarker() { 2812 void GrGLGpu::didAddGpuTraceMarker() {
2813 if (this->caps()->gpuTracingSupport()) { 2813 if (this->caps()->gpuTracingSupport()) {
2814 const GrTraceMarkerSet& markerArray = this->getActiveTraceMarkers(); 2814 const GrTraceMarkerSet& markerArray = this->getActiveTraceMarkers();
2815 SkString markerString = markerArray.toStringLast(); 2815 SkString markerString = markerArray.toStringLast();
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
2856 this->setVertexArrayID(gpu, 0); 2856 this->setVertexArrayID(gpu, 0);
2857 } 2857 }
2858 int attrCount = gpu->glCaps().maxVertexAttributes(); 2858 int attrCount = gpu->glCaps().maxVertexAttributes();
2859 if (fDefaultVertexArrayAttribState.count() != attrCount) { 2859 if (fDefaultVertexArrayAttribState.count() != attrCount) {
2860 fDefaultVertexArrayAttribState.resize(attrCount); 2860 fDefaultVertexArrayAttribState.resize(attrCount);
2861 } 2861 }
2862 attribState = &fDefaultVertexArrayAttribState; 2862 attribState = &fDefaultVertexArrayAttribState;
2863 } 2863 }
2864 return attribState; 2864 return attribState;
2865 } 2865 }
OLDNEW
« no previous file with comments | « src/gpu/gl/GrGLCaps.cpp ('k') | tests/GLProgramsTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698