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

Side by Side Diff: ui/gl/scoped_binders.h

Issue 2248213004: Fix gl_unittests on Mac core profile. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix Created 4 years, 4 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 | « no previous file | ui/gl/scoped_binders.cc » ('j') | ui/gl/scoped_binders.cc » ('J')
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 #ifndef UI_GL_SCOPED_BINDERS_H_ 5 #ifndef UI_GL_SCOPED_BINDERS_H_
6 #define UI_GL_SCOPED_BINDERS_H_ 6 #define UI_GL_SCOPED_BINDERS_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "ui/gl/gl_export.h" 9 #include "ui/gl/gl_export.h"
10 10
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 // TODO(dcastagna): Use GLStateRestorer. 82 // TODO(dcastagna): Use GLStateRestorer.
83 int buffer_; 83 int buffer_;
84 int enabled_; 84 int enabled_;
85 int index_; 85 int index_;
86 int size_; 86 int size_;
87 int type_; 87 int type_;
88 int normalized_; 88 int normalized_;
89 int stride_; 89 int stride_;
90 void* pointer_; 90 void* pointer_;
91 91
92 unsigned current_vao_;
93 unsigned vao_;
94
92 DISALLOW_COPY_AND_ASSIGN(ScopedVertexAttribArray); 95 DISALLOW_COPY_AND_ASSIGN(ScopedVertexAttribArray);
93 }; 96 };
94 97
95 class GL_EXPORT ScopedBufferBinder { 98 class GL_EXPORT ScopedBufferBinder {
96 public: 99 public:
97 ScopedBufferBinder(unsigned int target, unsigned int index); 100 ScopedBufferBinder(unsigned int target, unsigned int index);
98 ~ScopedBufferBinder(); 101 ~ScopedBufferBinder();
99 102
100 private: 103 private:
101 // TODO(dcastagna): Use GLStateRestorer. 104 // TODO(dcastagna): Use GLStateRestorer.
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 private: 152 private:
150 unsigned capability_; 153 unsigned capability_;
151 unsigned char enabled_; 154 unsigned char enabled_;
152 155
153 DISALLOW_COPY_AND_ASSIGN(ScopedCapability); 156 DISALLOW_COPY_AND_ASSIGN(ScopedCapability);
154 }; 157 };
155 158
156 } // namespace gl 159 } // namespace gl
157 160
158 #endif // UI_GL_SCOPED_BINDERS_H_ 161 #endif // UI_GL_SCOPED_BINDERS_H_
OLDNEW
« no previous file with comments | « no previous file | ui/gl/scoped_binders.cc » ('j') | ui/gl/scoped_binders.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698