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

Side by Side Diff: ppapi/examples/gles2/gles2.cc

Issue 9122012: gcl change rev (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 11 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
« no previous file with comments | « ppapi/examples/file_chooser/file_chooser.cc ('k') | ppapi/examples/mouse_lock/mouse_lock.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #include <string.h> 5 #include <string.h>
6 6
7 #include <iostream> 7 #include <iostream>
8 #include <sstream> 8 #include <sstream>
9 #include <list> 9 #include <list>
10 #include <map> 10 #include <map>
11 #include <set> 11 #include <set>
12 #include <vector> 12 #include <vector>
13 13
14 #include "ppapi/c/dev/ppb_console_dev.h" 14 #include "ppapi/c/dev/ppb_console_dev.h"
15 #include "ppapi/c/pp_errors.h" 15 #include "ppapi/c/pp_errors.h"
16 #include "ppapi/c/ppb_opengles2.h" 16 #include "ppapi/c/ppb_opengles2.h"
17 #include "ppapi/cpp/dev/video_decoder_client_dev.h" 17 #include "ppapi/cpp/dev/video_decoder_client_dev.h"
18 #include "ppapi/cpp/dev/video_decoder_dev.h" 18 #include "ppapi/cpp/dev/video_decoder_dev.h"
19 #include "ppapi/cpp/graphics_3d.h" 19 #include "ppapi/cpp/graphics_3d.h"
20 #include "ppapi/cpp/graphics_3d_client.h" 20 #include "ppapi/cpp/graphics_3d_client.h"
21 #include "ppapi/cpp/instance.h" 21 #include "ppapi/cpp/instance.h"
22 #include "ppapi/cpp/module.h" 22 #include "ppapi/cpp/module.h"
23 #include "ppapi/cpp/rect.h" 23 #include "ppapi/cpp/rect.h"
24 #include "ppapi/cpp/var.h" 24 #include "ppapi/cpp/var.h"
25 #include "ppapi/examples/gles2/testdata.h" 25 #include "ppapi/examples/gles2/testdata.h"
26 #include "ppapi/lib/gl/include/GLES2/gl2.h" 26 #include "ppapi/lib/gl/include/GLES2/gl2.h"
27 #include "ppapi/utility/completion_callback_factory.h"
27 28
28 // Use assert as a poor-man's CHECK, even in non-debug mode. 29 // Use assert as a poor-man's CHECK, even in non-debug mode.
29 // Since <assert.h> redefines assert on every inclusion (it doesn't use 30 // Since <assert.h> redefines assert on every inclusion (it doesn't use
30 // include-guards), make sure this is the last file #include'd in this file. 31 // include-guards), make sure this is the last file #include'd in this file.
31 #undef NDEBUG 32 #undef NDEBUG
32 #include <assert.h> 33 #include <assert.h>
33 34
34 // Assert |context_| isn't holding any GL Errors. Done as a macro instead of a 35 // Assert |context_| isn't holding any GL Errors. Done as a macro instead of a
35 // function to preserve line number information in the failure message. 36 // function to preserve line number information in the failure message.
36 #define assertNoGLError() \ 37 #define assertNoGLError() \
(...skipping 540 matching lines...) Expand 10 before | Expand all | Expand 10 after
577 gles2_if_->DeleteShader(context_->pp_resource(), shader); 578 gles2_if_->DeleteShader(context_->pp_resource(), shader);
578 } 579 }
579 } // anonymous namespace 580 } // anonymous namespace
580 581
581 namespace pp { 582 namespace pp {
582 // Factory function for your specialization of the Module object. 583 // Factory function for your specialization of the Module object.
583 Module* CreateModule() { 584 Module* CreateModule() {
584 return new GLES2DemoModule(); 585 return new GLES2DemoModule();
585 } 586 }
586 } // namespace pp 587 } // namespace pp
OLDNEW
« no previous file with comments | « ppapi/examples/file_chooser/file_chooser.cc ('k') | ppapi/examples/mouse_lock/mouse_lock.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698