Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(14)

Side by Side Diff: ui/gl/gl_surface_osmesa.cc

Issue 309463003: Revert of Updating calls to offscreen buffers to use a size of (0,0) when they do not require (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 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 | Annotate | Revision Log
« no previous file with comments | « ui/gl/gl_surface_egl.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "base/logging.h" 5 #include "base/logging.h"
6 #include "third_party/mesa/src/include/GL/osmesa.h" 6 #include "third_party/mesa/src/include/GL/osmesa.h"
7 #include "ui/gl/gl_bindings.h" 7 #include "ui/gl/gl_bindings.h"
8 #include "ui/gl/gl_context.h" 8 #include "ui/gl/gl_context.h"
9 #include "ui/gl/gl_surface_osmesa.h" 9 #include "ui/gl/gl_surface_osmesa.h"
10 #include "ui/gl/scoped_make_current.h" 10 #include "ui/gl/scoped_make_current.h"
11 11
12 namespace gfx { 12 namespace gfx {
13 13
14 GLSurfaceOSMesa::GLSurfaceOSMesa(unsigned format, const gfx::Size& size) 14 GLSurfaceOSMesa::GLSurfaceOSMesa(unsigned format, const gfx::Size& size)
15 : format_(format), 15 : format_(format),
16 size_(size) { 16 size_(size) {
17 // Implementations of OSMesa surface do not support having a 0 size. In such
18 // cases use a (1, 1) surface.
19 if (size_.GetArea() == 0)
20 size_.SetSize(1, 1);
21 } 17 }
22 18
23 bool GLSurfaceOSMesa::Initialize() { 19 bool GLSurfaceOSMesa::Initialize() {
24 return Resize(size_); 20 return Resize(size_);
25 } 21 }
26 22
27 void GLSurfaceOSMesa::Destroy() { 23 void GLSurfaceOSMesa::Destroy() {
28 buffer_.reset(); 24 buffer_.reset();
29 } 25 }
30 26
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 bool GLSurfaceOSMesaHeadless::IsOffscreen() { return false; } 86 bool GLSurfaceOSMesaHeadless::IsOffscreen() { return false; }
91 87
92 bool GLSurfaceOSMesaHeadless::SwapBuffers() { return true; } 88 bool GLSurfaceOSMesaHeadless::SwapBuffers() { return true; }
93 89
94 GLSurfaceOSMesaHeadless::GLSurfaceOSMesaHeadless() 90 GLSurfaceOSMesaHeadless::GLSurfaceOSMesaHeadless()
95 : GLSurfaceOSMesa(OSMESA_BGRA, gfx::Size(1, 1)) {} 91 : GLSurfaceOSMesa(OSMESA_BGRA, gfx::Size(1, 1)) {}
96 92
97 GLSurfaceOSMesaHeadless::~GLSurfaceOSMesaHeadless() { Destroy(); } 93 GLSurfaceOSMesaHeadless::~GLSurfaceOSMesaHeadless() { Destroy(); }
98 94
99 } // namespace gfx 95 } // namespace gfx
OLDNEW
« no previous file with comments | « ui/gl/gl_surface_egl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698