diff options
| author | brucedawson <brucedawson@chromium.org> | 2016-03-16 19:03:53 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-17 02:05:15 +0000 |
| commit | 4d9ecc15b1ca04d30113408a4d2c428456176ce0 (patch) | |
| tree | 5afbcd14290e762914dff2e2ef7915c1eae5e960 /gpu | |
| parent | 8cf168c5eb0ae5fb5480dfb32fb623873e6cbd8a (diff) | |
| download | chromium_src-4d9ecc15b1ca04d30113408a4d2c428456176ce0.zip chromium_src-4d9ecc15b1ca04d30113408a4d2c428456176ce0.tar.gz chromium_src-4d9ecc15b1ca04d30113408a4d2c428456176ce0.tar.bz2 | |
Fix VS 2015 Update 2 specific bug
When building Chrome with VS 2015 Update 2 RC there is a compiler error:
1> texture_definition.cc
1>base/memory/ref_counted.h(414): error C2027: use of undefined type 'gpu::gles2::GLStreamTextureImage'
1> gpu/command_buffer/service/texture_manager.h(31): note: see declaration of 'gpu::gles2::GLStreamTextureImage'
1> base/memory/ref_counted.h(413): note: while compiling class template member function 'void scoped_refptr<gpu::gles2::GLStreamTextureImage>::AddRef(T *)'
This is caused by a compiler bug, together with a type trait used in
std::vector:
https://twitter.com/StephanTLavavej/status/710191543840219136
A VS bug has been filed at:
https://connect.microsoft.com/VisualStudio/feedback/details/2475971
Bug 595189 has a more minimal repro.
BUG=440500,595189
CQ_INCLUDE_TRYBOTS=tryserver.chromium.win:win_optional_gpu_tests_rel;tryserver.chromium.mac:mac_optional_gpu_tests_rel
Review URL: https://codereview.chromium.org/1806743002
Cr-Commit-Position: refs/heads/master@{#381640}
Diffstat (limited to 'gpu')
| -rw-r--r-- | gpu/command_buffer/service/gl_stream_texture_image.h | 1 | ||||
| -rw-r--r-- | gpu/command_buffer/service/texture_definition.cc | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/gpu/command_buffer/service/gl_stream_texture_image.h b/gpu/command_buffer/service/gl_stream_texture_image.h index 2cd710a..a6a517d 100644 --- a/gpu/command_buffer/service/gl_stream_texture_image.h +++ b/gpu/command_buffer/service/gl_stream_texture_image.h @@ -5,6 +5,7 @@ #ifndef GPU_COMMAND_BUFFER_SERVICE_GL_STREAM_TEXTURE_IMAGE_H_ #define GPU_COMMAND_BUFFER_SERVICE_GL_STREAM_TEXTURE_IMAGE_H_ +#include "gpu/gpu_export.h" #include "ui/gl/gl_image.h" namespace gpu { diff --git a/gpu/command_buffer/service/texture_definition.cc b/gpu/command_buffer/service/texture_definition.cc index c166968..f8346c0 100644 --- a/gpu/command_buffer/service/texture_definition.cc +++ b/gpu/command_buffer/service/texture_definition.cc @@ -13,6 +13,9 @@ #include "base/memory/scoped_ptr.h" #include "base/synchronization/lock.h" #include "base/threading/thread_local.h" +// gl_stream_texture_image.h is included to work around crbug.com/595189, a +// compiler bug in VS 2015 Update 2 RC. +#include "gpu/command_buffer/service/gl_stream_texture_image.h" #include "gpu/command_buffer/service/texture_manager.h" #include "ui/gl/gl_image.h" #include "ui/gl/gl_implementation.h" |