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

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

Issue 1859703002: convert //gpu to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: convert newly added scoped_ptr's Created 4 years, 8 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
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_SHADER_MANAGER_H_ 5 #ifndef GPU_COMMAND_BUFFER_SERVICE_SHADER_MANAGER_H_
6 #define GPU_COMMAND_BUFFER_SERVICE_SHADER_MANAGER_H_ 6 #define GPU_COMMAND_BUFFER_SERVICE_SHADER_MANAGER_H_
7 7
8 #include <memory>
no sievers 2016/04/18 21:05:33 nit: unused
Mostyn Bramley-Moore 2016/04/18 21:47:01 Removed.
8 #include <string> 9 #include <string>
10
9 #include "base/containers/hash_tables.h" 11 #include "base/containers/hash_tables.h"
10 #include "base/logging.h" 12 #include "base/logging.h"
11 #include "base/macros.h" 13 #include "base/macros.h"
12 #include "base/memory/ref_counted.h" 14 #include "base/memory/ref_counted.h"
13 #include "base/memory/scoped_ptr.h"
14 #include "gpu/command_buffer/service/gl_utils.h" 15 #include "gpu/command_buffer/service/gl_utils.h"
15 #include "gpu/command_buffer/service/shader_translator.h" 16 #include "gpu/command_buffer/service/shader_translator.h"
16 #include "gpu/gpu_export.h" 17 #include "gpu/gpu_export.h"
17 18
18 namespace gpu { 19 namespace gpu {
19 namespace gles2 { 20 namespace gles2 {
20 21
21 // This is used to keep the source code for a shader. This is because in order 22 // This is used to keep the source code for a shader. This is because in order
22 // to emluate GLES2 the shaders will have to be re-written before passed to 23 // to emluate GLES2 the shaders will have to be re-written before passed to
23 // the underlying OpenGL. But, when the user calls glGetShaderSource they 24 // the underlying OpenGL. But, when the user calls glGetShaderSource they
(...skipping 278 matching lines...) Expand 10 before | Expand all | Expand 10 after
302 void RemoveShader(Shader* shader); 303 void RemoveShader(Shader* shader);
303 304
304 DISALLOW_COPY_AND_ASSIGN(ShaderManager); 305 DISALLOW_COPY_AND_ASSIGN(ShaderManager);
305 }; 306 };
306 307
307 } // namespace gles2 308 } // namespace gles2
308 } // namespace gpu 309 } // namespace gpu
309 310
310 #endif // GPU_COMMAND_BUFFER_SERVICE_SHADER_MANAGER_H_ 311 #endif // GPU_COMMAND_BUFFER_SERVICE_SHADER_MANAGER_H_
311 312
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698