| 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 "ui/gl/gl_context_glx.h" | 5 #include "ui/gl/gl_context_glx.h" |
| 6 | 6 |
| 7 extern "C" { | 7 extern "C" { |
| 8 #include <X11/Xlib.h> | 8 #include <X11/Xlib.h> |
| 9 } | 9 } |
| 10 #include <memory> | 10 #include <memory> |
| (...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 99 // On Mesa we try to create a core context, except for versions below 3.2 | 99 // On Mesa we try to create a core context, except for versions below 3.2 |
| 100 // where it is not applicable. (and fallback to ES as well) | 100 // where it is not applicable. (and fallback to ES as well) |
| 101 const ContextCreationInfo mesa_contexts_to_try[] = { | 101 const ContextCreationInfo mesa_contexts_to_try[] = { |
| 102 { GLX_CONTEXT_CORE_PROFILE_BIT_ARB, { GLVersion(4, 5) } }, | 102 { GLX_CONTEXT_CORE_PROFILE_BIT_ARB, { GLVersion(4, 5) } }, |
| 103 { GLX_CONTEXT_CORE_PROFILE_BIT_ARB, { GLVersion(4, 4) } }, | 103 { GLX_CONTEXT_CORE_PROFILE_BIT_ARB, { GLVersion(4, 4) } }, |
| 104 { GLX_CONTEXT_CORE_PROFILE_BIT_ARB, { GLVersion(4, 3) } }, | 104 { GLX_CONTEXT_CORE_PROFILE_BIT_ARB, { GLVersion(4, 3) } }, |
| 105 { GLX_CONTEXT_CORE_PROFILE_BIT_ARB, { GLVersion(4, 2) } }, | 105 { GLX_CONTEXT_CORE_PROFILE_BIT_ARB, { GLVersion(4, 2) } }, |
| 106 { GLX_CONTEXT_CORE_PROFILE_BIT_ARB, { GLVersion(4, 1) } }, | 106 { GLX_CONTEXT_CORE_PROFILE_BIT_ARB, { GLVersion(4, 1) } }, |
| 107 { GLX_CONTEXT_CORE_PROFILE_BIT_ARB, { GLVersion(4, 0) } }, | 107 { GLX_CONTEXT_CORE_PROFILE_BIT_ARB, { GLVersion(4, 0) } }, |
| 108 { GLX_CONTEXT_CORE_PROFILE_BIT_ARB, { GLVersion(3, 3) } }, | 108 { GLX_CONTEXT_CORE_PROFILE_BIT_ARB, { GLVersion(3, 3) } }, |
| 109 { GLX_CONTEXT_CORE_PROFILE_BIT_ARB, { GLVersion(3, 2) } }, | 109 // Do not try to create OpenGL context versions between 3.0 and |
| 110 { 0, { GLVersion(3, 1) } }, | 110 // 3.2 because of compatibility problems. crbug.com/659030 |
| 111 { 0, { GLVersion(3, 0) } }, | |
| 112 { 0, { GLVersion(2, 0) } }, | 111 { 0, { GLVersion(2, 0) } }, |
| 113 { 0, { GLVersion(1, 5) } }, | 112 { 0, { GLVersion(1, 5) } }, |
| 114 { 0, { GLVersion(1, 4) } }, | 113 { 0, { GLVersion(1, 4) } }, |
| 115 { 0, { GLVersion(1, 3) } }, | 114 { 0, { GLVersion(1, 3) } }, |
| 116 { 0, { GLVersion(1, 2) } }, | 115 { 0, { GLVersion(1, 2) } }, |
| 117 { 0, { GLVersion(1, 1) } }, | 116 { 0, { GLVersion(1, 1) } }, |
| 118 { 0, { GLVersion(1, 0) } }, | 117 { 0, { GLVersion(1, 0) } }, |
| 119 { GLX_CONTEXT_ES2_PROFILE_BIT_EXT, { GLVersion(3, 2) } }, | 118 { GLX_CONTEXT_ES2_PROFILE_BIT_EXT, { GLVersion(3, 2) } }, |
| 120 { GLX_CONTEXT_ES2_PROFILE_BIT_EXT, { GLVersion(3, 1) } }, | 119 { GLX_CONTEXT_ES2_PROFILE_BIT_EXT, { GLVersion(3, 1) } }, |
| 121 { GLX_CONTEXT_ES2_PROFILE_BIT_EXT, { GLVersion(3, 0) } }, | 120 { GLX_CONTEXT_ES2_PROFILE_BIT_EXT, { GLVersion(3, 0) } }, |
| (...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 320 | 319 |
| 321 bool GLContextGLX::WasAllocatedUsingRobustnessExtension() { | 320 bool GLContextGLX::WasAllocatedUsingRobustnessExtension() { |
| 322 return GLSurfaceGLX::IsCreateContextRobustnessSupported(); | 321 return GLSurfaceGLX::IsCreateContextRobustnessSupported(); |
| 323 } | 322 } |
| 324 | 323 |
| 325 GLContextGLX::~GLContextGLX() { | 324 GLContextGLX::~GLContextGLX() { |
| 326 Destroy(); | 325 Destroy(); |
| 327 } | 326 } |
| 328 | 327 |
| 329 } // namespace gl | 328 } // namespace gl |
| OLD | NEW |