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

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

Issue 2710683014: Revert of Fix VS 2015 Update 2 specific bug (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add back #include "gpu/gpu_export.h" Created 3 years, 10 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 | « no previous file | 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/synchronization/lock.h" 12 #include "base/synchronization/lock.h"
13 #include "base/threading/thread_local.h" 13 #include "base/threading/thread_local.h"
14 // gl_stream_texture_image.h is included to work around crbug.com/595189, a
15 // compiler bug in VS 2015 Update 2 RC.
16 #include "gpu/command_buffer/service/gl_stream_texture_image.h"
17 #include "gpu/command_buffer/service/texture_manager.h" 14 #include "gpu/command_buffer/service/texture_manager.h"
18 #include "ui/gl/gl_image.h" 15 #include "ui/gl/gl_image.h"
19 #include "ui/gl/gl_implementation.h" 16 #include "ui/gl/gl_implementation.h"
20 #include "ui/gl/scoped_binders.h" 17 #include "ui/gl/scoped_binders.h"
21 18
22 #if !defined(OS_MACOSX) 19 #if !defined(OS_MACOSX)
23 #include "base/macros.h" 20 #include "base/macros.h"
24 #include "ui/gl/gl_surface_egl.h" 21 #include "ui/gl/gl_surface_egl.h"
25 #endif 22 #endif
26 23
(...skipping 435 matching lines...) Expand 10 before | Expand all | Expand 10 after
462 return true; 459 return true;
463 } 460 }
464 461
465 bool TextureDefinition::SafeToRenderFrom() const { 462 bool TextureDefinition::SafeToRenderFrom() const {
466 return level_info_.cleared_rect.Contains( 463 return level_info_.cleared_rect.Contains(
467 gfx::Rect(level_info_.width, level_info_.height)); 464 gfx::Rect(level_info_.width, level_info_.height));
468 } 465 }
469 466
470 } // namespace gles2 467 } // namespace gles2
471 } // namespace gpu 468 } // namespace gpu
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698