OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "cc/resources/scoped_gpu_raster.h" | 5 #include "cc/resources/scoped_gpu_raster.h" |
6 #include "gpu/command_buffer/client/gles2_interface.h" | 6 #include "gpu/command_buffer/client/gles2_interface.h" |
7 #include "third_party/khronos/GLES2/gl2.h" | 7 #include "third_party/khronos/GLES2/gl2.h" |
8 #include "third_party/khronos/GLES2/gl2ext.h" | 8 #include "third_party/khronos/GLES2/gl2ext.h" |
9 #include "third_party/skia/include/gpu/GrContext.h" | 9 #include "third_party/skia/include/gpu/GrContext.h" |
10 | 10 |
(...skipping 12 matching lines...) Expand all Loading... |
23 | 23 |
24 void ScopedGpuRaster::BeginGpuRaster() { | 24 void ScopedGpuRaster::BeginGpuRaster() { |
25 GLES2Interface* gl = context_provider_->ContextGL(); | 25 GLES2Interface* gl = context_provider_->ContextGL(); |
26 | 26 |
27 // TODO(alokp): Use a trace macro to push/pop markers. | 27 // TODO(alokp): Use a trace macro to push/pop markers. |
28 // Using push/pop functions directly incurs cost to evaluate function | 28 // Using push/pop functions directly incurs cost to evaluate function |
29 // arguments even when tracing is disabled. | 29 // arguments even when tracing is disabled. |
30 gl->PushGroupMarkerEXT(0, "GpuRasterization"); | 30 gl->PushGroupMarkerEXT(0, "GpuRasterization"); |
31 | 31 |
32 class GrContext* gr_context = context_provider_->GrContext(); | 32 class GrContext* gr_context = context_provider_->GrContext(); |
33 gr_context->resetContext(); | 33 if (gr_context) |
| 34 gr_context->resetContext(); |
34 } | 35 } |
35 | 36 |
36 void ScopedGpuRaster::EndGpuRaster() { | 37 void ScopedGpuRaster::EndGpuRaster() { |
37 class GrContext* gr_context = context_provider_->GrContext(); | 38 class GrContext* gr_context = context_provider_->GrContext(); |
38 gr_context->flush(); | 39 if (gr_context) |
| 40 gr_context->flush(); |
39 | 41 |
40 GLES2Interface* gl = context_provider_->ContextGL(); | 42 GLES2Interface* gl = context_provider_->ContextGL(); |
41 | 43 |
42 // Restore default GL unpack alignment. TextureUploader expects this. | 44 // Restore default GL unpack alignment. TextureUploader expects this. |
43 gl->PixelStorei(GL_UNPACK_ALIGNMENT, 4); | 45 gl->PixelStorei(GL_UNPACK_ALIGNMENT, 4); |
44 | 46 |
45 // TODO(alokp): Use a trace macro to push/pop markers. | 47 // TODO(alokp): Use a trace macro to push/pop markers. |
46 // Using push/pop functions directly incurs cost to evaluate function | 48 // Using push/pop functions directly incurs cost to evaluate function |
47 // arguments even when tracing is disabled. | 49 // arguments even when tracing is disabled. |
48 gl->PopGroupMarkerEXT(); | 50 gl->PopGroupMarkerEXT(); |
49 } | 51 } |
50 | 52 |
51 } // namespace cc | 53 } // namespace cc |
OLD | NEW |