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

Side by Side Diff: gpu/command_buffer/service/texture_definition.cc

Issue 1806743002: Fix VS 2015 Update 2 specific bug (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added comment Created 4 years, 9 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 | « gpu/command_buffer/service/gl_stream_texture_image.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "gpu/command_buffer/service/texture_definition.h" 5 #include "gpu/command_buffer/service/texture_definition.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include <list> 9 #include <list>
10 10
11 #include "base/lazy_instance.h" 11 #include "base/lazy_instance.h"
12 #include "base/memory/linked_ptr.h" 12 #include "base/memory/linked_ptr.h"
13 #include "base/memory/scoped_ptr.h" 13 #include "base/memory/scoped_ptr.h"
14 #include "base/synchronization/lock.h" 14 #include "base/synchronization/lock.h"
15 #include "base/threading/thread_local.h" 15 #include "base/threading/thread_local.h"
16 // gl_stream_texture_image.h is included to work around crbug.com/595189, a
17 // compiler bug in VS 2015 Update 2 RC.
18 #include "gpu/command_buffer/service/gl_stream_texture_image.h"
16 #include "gpu/command_buffer/service/texture_manager.h" 19 #include "gpu/command_buffer/service/texture_manager.h"
17 #include "ui/gl/gl_image.h" 20 #include "ui/gl/gl_image.h"
18 #include "ui/gl/gl_implementation.h" 21 #include "ui/gl/gl_implementation.h"
19 #include "ui/gl/scoped_binders.h" 22 #include "ui/gl/scoped_binders.h"
20 23
21 #if !defined(OS_MACOSX) 24 #if !defined(OS_MACOSX)
22 #include "base/macros.h" 25 #include "base/macros.h"
23 #include "ui/gl/gl_surface_egl.h" 26 #include "ui/gl/gl_surface_egl.h"
24 #endif 27 #endif
25 28
(...skipping 437 matching lines...) Expand 10 before | Expand all | Expand 10 after
463 return true; 466 return true;
464 } 467 }
465 468
466 bool TextureDefinition::SafeToRenderFrom() const { 469 bool TextureDefinition::SafeToRenderFrom() const {
467 return level_info_.cleared_rect.Contains( 470 return level_info_.cleared_rect.Contains(
468 gfx::Rect(level_info_.width, level_info_.height)); 471 gfx::Rect(level_info_.width, level_info_.height));
469 } 472 }
470 473
471 } // namespace gles2 474 } // namespace gles2
472 } // namespace gpu 475 } // namespace gpu
OLDNEW
« no previous file with comments | « gpu/command_buffer/service/gl_stream_texture_image.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698