gpu/command_buffer/service/gles2_cmd_decoder_unittest_programs.cc - Issue 1103403002: gpu: Fix dependency cycle between service_sources and config_sources.

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

Issue 1103403002: gpu: Fix dependency cycle between service_sources and config_sources. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: hacky Created 5 years, 8 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/gles2_cmd_decoder_unittest_drawing.cc ('k') | gpu/command_buffer/service/gles2_cmd_decoder_unittest_textures.cc » ('j') | gpu/command_buffer/service/gpu_switches.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 "gpu/command_buffer/service/gles2_cmd_decoder.h"	5 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"

6	6

7 #include "base/command_line.h"	7 #include "base/command_line.h"

8 #include "base/strings/string_number_conversions.h"	8 #include "base/strings/string_number_conversions.h"

9 #include "gpu/command_buffer/common/gles2_cmd_format.h"	9 #include "gpu/command_buffer/common/gles2_cmd_format.h"

10 #include "gpu/command_buffer/common/gles2_cmd_utils.h"	10 #include "gpu/command_buffer/common/gles2_cmd_utils.h"

11 #include "gpu/command_buffer/service/async_pixel_transfer_delegate_mock.h"	11 #include "gpu/command_buffer/service/async_pixel_transfer_delegate_mock.h"

12 #include "gpu/command_buffer/service/async_pixel_transfer_manager.h"	12 #include "gpu/command_buffer/service/async_pixel_transfer_manager.h"

13 #include "gpu/command_buffer/service/async_pixel_transfer_manager_mock.h"	13 #include "gpu/command_buffer/service/async_pixel_transfer_manager_mock.h"

14 #include "gpu/command_buffer/service/cmd_buffer_engine.h"	14 #include "gpu/command_buffer/service/cmd_buffer_engine.h"

15 #include "gpu/command_buffer/service/context_group.h"	15 #include "gpu/command_buffer/service/context_group.h"

16 #include "gpu/command_buffer/service/context_state.h"	16 #include "gpu/command_buffer/service/context_state.h"

17 #include "gpu/command_buffer/service/gl_surface_mock.h"	17 #include "gpu/command_buffer/service/gl_surface_mock.h"

18 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest.h"	18 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest.h"

19

20 #include "gpu/command_buffer/service/gpu_switches.h"

21 #include "gpu/command_buffer/service/image_manager.h"	19 #include "gpu/command_buffer/service/image_manager.h"

22 #include "gpu/command_buffer/service/mailbox_manager.h"	20 #include "gpu/command_buffer/service/mailbox_manager.h"

23 #include "gpu/command_buffer/service/mocks.h"	21 #include "gpu/command_buffer/service/mocks.h"

24 #include "gpu/command_buffer/service/program_manager.h"	22 #include "gpu/command_buffer/service/program_manager.h"

25 #include "gpu/command_buffer/service/test_helper.h"	23 #include "gpu/command_buffer/service/test_helper.h"

	24 #include "gpu/config/gpu_switches.h"

26 #include "testing/gtest/include/gtest/gtest.h"	25 #include "testing/gtest/include/gtest/gtest.h"

27 #include "ui/gl/gl_implementation.h"	26 #include "ui/gl/gl_implementation.h"

28 #include "ui/gl/gl_mock.h"	27 #include "ui/gl/gl_mock.h"

29 #include "ui/gl/gl_surface_stub.h"	28 #include "ui/gl/gl_surface_stub.h"

30	29

31 #if !defined(GL_DEPTH24_STENCIL8)	30 #if !defined(GL_DEPTH24_STENCIL8)

32 #define GL_DEPTH24_STENCIL8 0x88F0	31 #define GL_DEPTH24_STENCIL8 0x88F0

33 #endif	32 #endif

34	33

35 using ::gfx::MockGLInterface;	34 using ::gfx::MockGLInterface;

(...skipping 1968 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
2004 }	2003 }

2005	2004

2006 // TODO(gman): DeleteProgram	2005 // TODO(gman): DeleteProgram

2007	2006

2008 // TODO(gman): UseProgram	2007 // TODO(gman): UseProgram

2009	2008

2010 // TODO(gman): DeleteShader	2009 // TODO(gman): DeleteShader

2011	2010

2012 } // namespace gles2	2011 } // namespace gles2

2013 } // namespace gpu	2012 } // namespace gpu

OLD	NEW