| 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 17 matching lines...) Expand all  Loading... | 
| 28  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 28  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 
| 29  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 29  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 
| 30  */ | 30  */ | 
| 31 | 31 | 
| 32 | 32 | 
| 33 // This file contains the declaration of the EffectParamGL and EffectGL classes. | 33 // This file contains the declaration of the EffectParamGL and EffectGL classes. | 
| 34 | 34 | 
| 35 #ifndef O3D_COMMAND_BUFFER_SERVICE_CROSS_GL_EFFECT_GL_H_ | 35 #ifndef O3D_COMMAND_BUFFER_SERVICE_CROSS_GL_EFFECT_GL_H_ | 
| 36 #define O3D_COMMAND_BUFFER_SERVICE_CROSS_GL_EFFECT_GL_H_ | 36 #define O3D_COMMAND_BUFFER_SERVICE_CROSS_GL_EFFECT_GL_H_ | 
| 37 | 37 | 
| 38 #include <Cg/cg.h> |  | 
| 39 #include <Cg/cgGL.h> |  | 
| 40 #include <vector> | 38 #include <vector> | 
| 41 | 39 | 
| 42 #include "command_buffer/common/cross/gapi_interface.h" | 40 #include "command_buffer/common/cross/gapi_interface.h" | 
| 43 #include "command_buffer/service/cross/resource.h" | 41 #include "command_buffer/service/cross/resource.h" | 
| 44 #include "command_buffer/service/cross/gl/gl_utils.h" | 42 #include "command_buffer/service/cross/gl/gl_utils.h" | 
| 45 | 43 | 
| 46 namespace o3d { | 44 namespace o3d { | 
| 47 namespace command_buffer { | 45 namespace command_buffer { | 
| 48 | 46 | 
| 49 class GAPIGL; | 47 class GAPIGL; | 
| (...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 156 | 154 | 
| 157   friend class EffectParamGL; | 155   friend class EffectParamGL; | 
| 158   DISALLOW_COPY_AND_ASSIGN(EffectGL); | 156   DISALLOW_COPY_AND_ASSIGN(EffectGL); | 
| 159 }; | 157 }; | 
| 160 | 158 | 
| 161 | 159 | 
| 162 }  // namespace command_buffer | 160 }  // namespace command_buffer | 
| 163 }  // namespace o3d | 161 }  // namespace o3d | 
| 164 | 162 | 
| 165 #endif  // O3D_COMMAND_BUFFER_SERVICE_CROSS_GL_EFFECT_GL_H_ | 163 #endif  // O3D_COMMAND_BUFFER_SERVICE_CROSS_GL_EFFECT_GL_H_ | 
| OLD | NEW | 
|---|