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

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

Issue 7458008: Support GL_OES_EGL_image_external (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: fix typo which hung the windows gpu_unittests by corrupting the stack Created 9 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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_PROGRAM_MANAGER_H_ 5 #ifndef GPU_COMMAND_BUFFER_SERVICE_PROGRAM_MANAGER_H_
6 #define GPU_COMMAND_BUFFER_SERVICE_PROGRAM_MANAGER_H_ 6 #define GPU_COMMAND_BUFFER_SERVICE_PROGRAM_MANAGER_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 21 matching lines...) Expand all
32 public: 32 public:
33 typedef scoped_refptr<ProgramInfo> Ref; 33 typedef scoped_refptr<ProgramInfo> Ref;
34 34
35 static const int kMaxAttachedShaders = 2; 35 static const int kMaxAttachedShaders = 2;
36 36
37 struct UniformInfo { 37 struct UniformInfo {
38 UniformInfo(GLsizei _size, GLenum _type, const std::string& _name); 38 UniformInfo(GLsizei _size, GLenum _type, const std::string& _name);
39 ~UniformInfo(); 39 ~UniformInfo();
40 40
41 bool IsSampler() const { 41 bool IsSampler() const {
42 return type == GL_SAMPLER_2D || type == GL_SAMPLER_CUBE; 42 return type == GL_SAMPLER_2D || type == GL_SAMPLER_CUBE ||
43 type == GL_SAMPLER_EXTERNAL_OES;
43 } 44 }
44 45
45 GLsizei size; 46 GLsizei size;
46 GLenum type; 47 GLenum type;
47 bool is_array; 48 bool is_array;
48 std::string name; 49 std::string name;
49 std::vector<GLint> element_locations; 50 std::vector<GLint> element_locations;
50 std::vector<GLuint> texture_units; 51 std::vector<GLuint> texture_units;
51 }; 52 };
52 struct VertexAttribInfo { 53 struct VertexAttribInfo {
(...skipping 232 matching lines...) Expand 10 before | Expand all | Expand 10 after
285 void RemoveProgramInfoIfUnused( 286 void RemoveProgramInfoIfUnused(
286 ShaderManager* shader_manager, ProgramInfo* info); 287 ShaderManager* shader_manager, ProgramInfo* info);
287 288
288 DISALLOW_COPY_AND_ASSIGN(ProgramManager); 289 DISALLOW_COPY_AND_ASSIGN(ProgramManager);
289 }; 290 };
290 291
291 } // namespace gles2 292 } // namespace gles2
292 } // namespace gpu 293 } // namespace gpu
293 294
294 #endif // GPU_COMMAND_BUFFER_SERVICE_PROGRAM_MANAGER_H_ 295 #endif // GPU_COMMAND_BUFFER_SERVICE_PROGRAM_MANAGER_H_
OLDNEW
« no previous file with comments | « gpu/command_buffer/service/gles2_cmd_validation_implementation_autogen.h ('k') | gpu/command_buffer/service/test_helper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698