| 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 327 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 338     const math::Matrix4 &view_; | 338     const math::Matrix4 &view_; | 
| 339   }; | 339   }; | 
| 340 | 340 | 
| 341   // Draws one bubble. | 341   // Draws one bubble. | 
| 342   void DrawBubble(const math::Matrix4& view, | 342   void DrawBubble(const math::Matrix4& view, | 
| 343                   const math::Matrix4& proj, | 343                   const math::Matrix4& proj, | 
| 344                   const BubbleDemo::Bubble &bubble, | 344                   const BubbleDemo::Bubble &bubble, | 
| 345                   const math::Vector3& rotation); | 345                   const math::Vector3& rotation); | 
| 346 | 346 | 
| 347   nacl::HtpHandle handle_pair_[2]; | 347   nacl::HtpHandle handle_pair_[2]; | 
| 348   ResourceID vertex_buffer_id_; | 348   ResourceId vertex_buffer_id_; | 
| 349   ResourceID index_buffer_id_; | 349   ResourceId index_buffer_id_; | 
| 350   ResourceID vertex_struct_id_; | 350   ResourceId vertex_struct_id_; | 
| 351   ResourceID effect_id_; | 351   ResourceId effect_id_; | 
| 352   ResourceID noise_texture_id_; | 352   ResourceId noise_texture_id_; | 
| 353   ResourceID iridescence_texture_id_; | 353   ResourceId iridescence_texture_id_; | 
| 354   ResourceID cubemap_id_; | 354   ResourceId cubemap_id_; | 
| 355   ResourceID noise_sampler_id_; | 355   ResourceId noise_sampler_id_; | 
| 356   ResourceID iridescence_sampler_id_; | 356   ResourceId iridescence_sampler_id_; | 
| 357   ResourceID cubemap_sampler_id_; | 357   ResourceId cubemap_sampler_id_; | 
| 358   ResourceID noise_sampler_param_id_; | 358   ResourceId noise_sampler_param_id_; | 
| 359   ResourceID iridescence_sampler_param_id_; | 359   ResourceId iridescence_sampler_param_id_; | 
| 360   ResourceID cubemap_sampler_param_id_; | 360   ResourceId cubemap_sampler_param_id_; | 
| 361   ResourceID mvp_param_id_; | 361   ResourceId mvp_param_id_; | 
| 362   ResourceID world_param_id_; | 362   ResourceId world_param_id_; | 
| 363   ResourceID worldIT_param_id_; | 363   ResourceId worldIT_param_id_; | 
| 364   ResourceID eye_param_id_; | 364   ResourceId eye_param_id_; | 
| 365   ResourceID thickness_param_id_; | 365   ResourceId thickness_param_id_; | 
| 366   scoped_ptr<IMCSender> sender_; | 366   scoped_ptr<IMCSender> sender_; | 
| 367   scoped_ptr<BufferSyncProxy> proxy_; | 367   scoped_ptr<BufferSyncProxy> proxy_; | 
| 368   scoped_ptr<CommandBufferHelper> helper_; | 368   scoped_ptr<CommandBufferHelper> helper_; | 
| 369   scoped_ptr<FencedAllocatorWrapper> allocator_; | 369   scoped_ptr<FencedAllocatorWrapper> allocator_; | 
| 370   RPCShmHandle shm_; | 370   RPCShmHandle shm_; | 
| 371   unsigned int shm_id_; | 371   unsigned int shm_id_; | 
| 372   void *shm_address_; | 372   void *shm_address_; | 
| 373   CustomVertex *vertices_; | 373   CustomVertex *vertices_; | 
| 374   unsigned int *indices_; | 374   unsigned int *indices_; | 
| 375   unsigned char *noise_texture_; | 375   unsigned char *noise_texture_; | 
| (...skipping 920 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1296   nacl::HtpHandle htp_handle = InitConnection(argc, argv); | 1296   nacl::HtpHandle htp_handle = InitConnection(argc, argv); | 
| 1297   if (htp_handle == nacl::kInvalidHtpHandle) { | 1297   if (htp_handle == nacl::kInvalidHtpHandle) { | 
| 1298     return 1; | 1298     return 1; | 
| 1299   } | 1299   } | 
| 1300 | 1300 | 
| 1301   o3d::command_buffer::BubbleDemo(htp_handle); | 1301   o3d::command_buffer::BubbleDemo(htp_handle); | 
| 1302   CloseConnection(htp_handle); | 1302   CloseConnection(htp_handle); | 
| 1303   return 0; | 1303   return 0; | 
| 1304 } | 1304 } | 
| 1305 | 1305 | 
| OLD | NEW | 
|---|