| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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_unittest_base.h" | 5 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <string> | 8 #include <string> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 56 contains_vao_extension = true; | 56 contains_vao_extension = true; |
| 57 break; | 57 break; |
| 58 } | 58 } |
| 59 } | 59 } |
| 60 | 60 |
| 61 if (init->use_native_vao) { | 61 if (init->use_native_vao) { |
| 62 if (contains_vao_extension) | 62 if (contains_vao_extension) |
| 63 return; | 63 return; |
| 64 if (!init->extensions.empty()) | 64 if (!init->extensions.empty()) |
| 65 init->extensions += " "; | 65 init->extensions += " "; |
| 66 if (base::StartsWithASCII(init->gl_version, "opengl es", false)) { | 66 if (base::StartsWith(init->gl_version, "opengl es", |
| 67 base::CompareCase::INSENSITIVE_ASCII)) { |
| 67 init->extensions += kVAOExtensions[0]; | 68 init->extensions += kVAOExtensions[0]; |
| 68 } else { | 69 } else { |
| 69 #if !defined(OS_MACOSX) | 70 #if !defined(OS_MACOSX) |
| 70 init->extensions += kVAOExtensions[1]; | 71 init->extensions += kVAOExtensions[1]; |
| 71 #else | 72 #else |
| 72 init->extensions += kVAOExtensions[2]; | 73 init->extensions += kVAOExtensions[2]; |
| 73 #endif // OS_MACOSX | 74 #endif // OS_MACOSX |
| 74 } | 75 } |
| 75 } else { | 76 } else { |
| 76 // Make sure we don't set up an invalid InitState. | 77 // Make sure we don't set up an invalid InitState. |
| (...skipping 1759 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1836 SetupDefaultProgram(); | 1837 SetupDefaultProgram(); |
| 1837 } | 1838 } |
| 1838 | 1839 |
| 1839 // Include the auto-generated part of this file. We split this because it means | 1840 // Include the auto-generated part of this file. We split this because it means |
| 1840 // we can easily edit the non-auto generated parts right here in this file | 1841 // we can easily edit the non-auto generated parts right here in this file |
| 1841 // instead of having to edit some template or the code generator. | 1842 // instead of having to edit some template or the code generator. |
| 1842 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_0_autogen.h" | 1843 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_0_autogen.h" |
| 1843 | 1844 |
| 1844 } // namespace gles2 | 1845 } // namespace gles2 |
| 1845 } // namespace gpu | 1846 } // namespace gpu |
| OLD | NEW |