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

Side by Side Diff: gpu/command_buffer/service/mailbox_manager.h

Issue 166853002: Revert of Fix (or tag) uses of explicit '64' instead of GL_MAILBOX_SIZE_CHROMIUM (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 10 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 | « gpu/command_buffer/common/mailbox.h ('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 #ifndef GPU_COMMAND_BUFFER_SERVICE_MAILBOX_MANAGER_H_ 5 #ifndef GPU_COMMAND_BUFFER_SERVICE_MAILBOX_MANAGER_H_
6 #define GPU_COMMAND_BUFFER_SERVICE_MAILBOX_MANAGER_H_ 6 #define GPU_COMMAND_BUFFER_SERVICE_MAILBOX_MANAGER_H_
7 7
8 #include <functional> 8 #include <functional>
9 #include <map> 9 #include <map>
10 10
11 #include "base/memory/linked_ptr.h" 11 #include "base/memory/linked_ptr.h"
12 #include "base/memory/ref_counted.h" 12 #include "base/memory/ref_counted.h"
13 #include "gpu/command_buffer/common/constants.h" 13 #include "gpu/command_buffer/common/constants.h"
14 #include "gpu/command_buffer/common/mailbox.h" 14 #include "gpu/command_buffer/common/mailbox.h"
15 #include "gpu/gpu_export.h" 15 #include "gpu/gpu_export.h"
16 16
17 // From gl2/gl2ext.h.
18 #ifndef GL_MAILBOX_SIZE_CHROMIUM
19 #define GL_MAILBOX_SIZE_CHROMIUM 64
20 #endif
21
17 typedef signed char GLbyte; 22 typedef signed char GLbyte;
18 23
19 namespace gpu { 24 namespace gpu {
20 namespace gles2 { 25 namespace gles2 {
21 26
22 class Texture; 27 class Texture;
23 class TextureManager; 28 class TextureManager;
24 29
25 // Manages resources scoped beyond the context or context group level. 30 // Manages resources scoped beyond the context or context group level.
26 class GPU_EXPORT MailboxManager : public base::RefCounted<MailboxManager> { 31 class GPU_EXPORT MailboxManager : public base::RefCounted<MailboxManager> {
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 MailboxToTextureMap mailbox_to_textures_; 73 MailboxToTextureMap mailbox_to_textures_;
69 TextureToMailboxMap textures_to_mailboxes_; 74 TextureToMailboxMap textures_to_mailboxes_;
70 75
71 DISALLOW_COPY_AND_ASSIGN(MailboxManager); 76 DISALLOW_COPY_AND_ASSIGN(MailboxManager);
72 }; 77 };
73 } // namespage gles2 78 } // namespage gles2
74 } // namespace gpu 79 } // namespace gpu
75 80
76 #endif // GPU_COMMAND_BUFFER_SERVICE_MAILBOX_MANAGER_H_ 81 #endif // GPU_COMMAND_BUFFER_SERVICE_MAILBOX_MANAGER_H_
77 82
OLDNEW
« no previous file with comments | « gpu/command_buffer/common/mailbox.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698