OLD | NEW |
1 /* | 1 /* |
2 * Copyright 2009, Google Inc. | 2 * Copyright 2009, Google Inc. |
3 * All rights reserved. | 3 * All rights reserved. |
4 * | 4 * |
5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
6 * modification, are permitted provided that the following conditions are | 6 * modification, are permitted provided that the following conditions are |
7 * met: | 7 * met: |
8 * | 8 * |
9 * * Redistributions of source code must retain the above copyright | 9 * * Redistributions of source code must retain the above copyright |
10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
(...skipping 24 matching lines...) Expand all Loading... |
35 | 35 |
36 #ifndef O3D_COMMAND_BUFFER_SERVICE_CROSS_GL_GEOMETRY_GL_H_ | 36 #ifndef O3D_COMMAND_BUFFER_SERVICE_CROSS_GL_GEOMETRY_GL_H_ |
37 #define O3D_COMMAND_BUFFER_SERVICE_CROSS_GL_GEOMETRY_GL_H_ | 37 #define O3D_COMMAND_BUFFER_SERVICE_CROSS_GL_GEOMETRY_GL_H_ |
38 | 38 |
39 #include "command_buffer/common/cross/gapi_interface.h" | 39 #include "command_buffer/common/cross/gapi_interface.h" |
40 #include "command_buffer/service/cross/resource.h" | 40 #include "command_buffer/service/cross/resource.h" |
41 #include "command_buffer/service/cross/gl/gl_utils.h" | 41 #include "command_buffer/service/cross/gl/gl_utils.h" |
42 | 42 |
43 namespace o3d { | 43 namespace o3d { |
44 namespace command_buffer { | 44 namespace command_buffer { |
| 45 namespace o3d { |
45 | 46 |
46 class GAPIGL; | 47 class GAPIGL; |
47 | 48 |
48 // GL version of VertexBuffer. | 49 // GL version of VertexBuffer. |
49 class VertexBufferGL : public VertexBuffer { | 50 class VertexBufferGL : public VertexBuffer { |
50 public: | 51 public: |
51 VertexBufferGL(unsigned int size, unsigned int flags) | 52 VertexBufferGL(unsigned int size, unsigned int flags) |
52 : VertexBuffer(size, flags), | 53 : VertexBuffer(size, flags), |
53 gl_buffer_(0) {} | 54 gl_buffer_(0) {} |
54 virtual ~VertexBufferGL(); | 55 virtual ~VertexBufferGL(); |
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
131 | 132 |
132 // Compiles the vertex declaration into the attribute array. | 133 // Compiles the vertex declaration into the attribute array. |
133 void Compile(); | 134 void Compile(); |
134 | 135 |
135 bool dirty_; | 136 bool dirty_; |
136 AttribDesc attribs_[kMaxAttribs]; | 137 AttribDesc attribs_[kMaxAttribs]; |
137 DISALLOW_COPY_AND_ASSIGN(VertexStructGL); | 138 DISALLOW_COPY_AND_ASSIGN(VertexStructGL); |
138 }; | 139 }; |
139 | 140 |
140 | 141 |
| 142 } // namespace o3d |
141 } // namespace command_buffer | 143 } // namespace command_buffer |
142 } // namespace o3d | 144 } // namespace o3d |
143 | 145 |
144 #endif // O3D_COMMAND_BUFFER_SERVICE_CROSS_GL_GEOMETRY_GL_H_ | 146 #endif // O3D_COMMAND_BUFFER_SERVICE_CROSS_GL_GEOMETRY_GL_H_ |
OLD | NEW |