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_surface.h" | 5 #include "ui/gl/gl_surface.h" |
6 | 6 |
7 #include "base/logging.h" | 7 #include "base/logging.h" |
8 #include "base/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" |
9 #include "base/message_loop/message_loop.h" | 9 #include "base/message_loop/message_loop.h" |
10 #include "base/trace_event/trace_event.h" | 10 #include "base/trace_event/trace_event.h" |
(...skipping 301 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
312 switch (GetGLImplementation()) { | 312 switch (GetGLImplementation()) { |
313 case kGLImplementationOSMesaGL: { | 313 case kGLImplementationOSMesaGL: { |
314 scoped_refptr<GLSurface> surface( | 314 scoped_refptr<GLSurface> surface( |
315 new GLSurfaceOSMesa(OSMesaSurfaceFormatRGBA, size)); | 315 new GLSurfaceOSMesa(OSMesaSurfaceFormatRGBA, size)); |
316 if (!surface->Initialize()) | 316 if (!surface->Initialize()) |
317 return NULL; | 317 return NULL; |
318 | 318 |
319 return surface; | 319 return surface; |
320 } | 320 } |
321 case kGLImplementationDesktopGL: { | 321 case kGLImplementationDesktopGL: { |
322 scoped_refptr<GLSurface> surface(new PbufferGLSurfaceGLX(size)); | 322 scoped_refptr<GLSurface> surface( |
| 323 new UnmappedNativeViewGLSurfaceGLX(size)); |
323 if (!surface->Initialize()) | 324 if (!surface->Initialize()) |
324 return NULL; | 325 return NULL; |
325 | 326 |
326 return surface; | 327 return surface; |
327 } | 328 } |
328 case kGLImplementationEGLGLES2: { | 329 case kGLImplementationEGLGLES2: { |
329 scoped_refptr<GLSurface> surface(new PbufferGLSurfaceEGL(size)); | 330 scoped_refptr<GLSurface> surface(new PbufferGLSurfaceEGL(size)); |
330 if (!surface->Initialize()) | 331 if (!surface->Initialize()) |
331 return NULL; | 332 return NULL; |
332 | 333 |
333 return surface; | 334 return surface; |
334 } | 335 } |
335 case kGLImplementationMockGL: | 336 case kGLImplementationMockGL: |
336 return new GLSurfaceStub; | 337 return new GLSurfaceStub; |
337 default: | 338 default: |
338 NOTREACHED(); | 339 NOTREACHED(); |
339 return NULL; | 340 return NULL; |
340 } | 341 } |
341 } | 342 } |
342 | 343 |
343 EGLNativeDisplayType GetPlatformDefaultEGLNativeDisplay() { | 344 EGLNativeDisplayType GetPlatformDefaultEGLNativeDisplay() { |
344 return gfx::GetXDisplay(); | 345 return gfx::GetXDisplay(); |
345 } | 346 } |
346 | 347 |
347 } // namespace gfx | 348 } // namespace gfx |
OLD | NEW |