Moved the logic of maintaining the current context to gles2 helper library.

gpu/demos/demos.gyp

 # Copyright (c) 2009 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
+  'includes': [
+    '../../ppapi/ppapi.gypi',
+  ],
   'variables': {
     'chromium_code': 1,
     'conditions': [
       # Pepper demos that are compiled as shared libraries need to be compiled
       # with -fPIC flag. All static libraries that these demos depend on must
       # also be compiled with -fPIC flag. Setting GYP_DEFINES="linux_fpic=1"
       # compiles everything with -fPIC. Disable pepper demos on linux/x64
       # unless linux_fpic is 1.
       ['OS=="linux" and (target_arch=="x64" or target_arch=="arm") and linux_fpic!=1', {
         'enable_pepper_demos%': 0,
@@ skipping 104 matching lines @@
             'product_extension': 'plugin',
           }],
         ],
       },
     },
     {
       'target_name': 'gpu_demo_framework_ppapi',
       'type': 'static_library',
       'dependencies': [
         'gpu_demo_framework',
-        '../../ppapi/ppapi.gyp:ppapi_cpp',
-        '../../ppapi/ppapi.gyp:ppapi_cpp_objects'
+        '../../ppapi/ppapi.gyp:ppapi_cpp_objects',
+        '../../ppapi/ppapi.gyp:ppapi_gles2',
       ],
       'include_dirs': [
         '../..',
         '../../ppapi',
+        '../../ppapi/lib/gl/include',
         '../../third_party/gles2_book/Common/Include',
       ],
       'sources': [
         'framework/pepper.cc',
         '../../third_party/gles2_book/Common/Include/esUtil.h',
         '../../third_party/gles2_book/Common/Include/esUtil_win.h',
         '../../third_party/gles2_book/Common/Source/esShader.c',
         '../../third_party/gles2_book/Common/Source/esShapes.c',
         '../../third_party/gles2_book/Common/Source/esTransform.c',
         '../../third_party/gles2_book/Common/Source/esUtil.c',
       ],
       'direct_dependent_settings': {
         'include_dirs': [
           '../../third_party',
           '../../third_party/gles2_book/Common/Include',
           '../../ppapi',
+          '../../ppapi/lib/gl/include',
           '../..'
         ],
         'run_as': {
           'conditions': [
             ['OS=="mac"', {
               'action': [
                 '<(PRODUCT_DIR)/Chromium.app/Contents/MacOS/Chromium',
                 '--enable-accelerated-layers',
                 '--register-pepper-plugins='
                   '<(PRODUCT_DIR)/$(PRODUCT_NAME).plugin;'
@@ skipping 194 matching lines @@
             'gles2_book/example.h',
             'gles2_book/demo_texture_wrap.cc',
           ],
         },
         {
           'target_name': 'hello_triangle_ppapi',
           'type': 'loadable_module',
           'variables': { 'chromium_code': 0, },
           'dependencies': [ 'gpu_demo_framework_ppapi', ],
           'sources': [
+            '<@(ppp_entrypoints_sources)',
             'gles2_book/example.h',
             'gles2_book/demo_hello_triangle.cc',
             '../../third_party/gles2_book/Chapter_2/Hello_Triangle/Hello_Triangle.c',
             '../../third_party/gles2_book/Chapter_2/Hello_Triangle/Hello_Triangle.h',
           ],
         },
         {
           'target_name': 'mip_map_2d_ppapi',
           'type': 'loadable_module',
           'variables': { 'chromium_code': 0, },
           'dependencies': [ 'gpu_demo_framework_ppapi', ],
           'sources': [
+            '<@(ppp_entrypoints_sources)',
             'gles2_book/example.h',
             'gles2_book/demo_mip_map_2d.cc',
             '../../third_party/gles2_book/Chapter_9/MipMap2D/MipMap2D.c',
             '../../third_party/gles2_book/Chapter_9/MipMap2D/MipMap2D.h',
           ],
         },
         {
           'target_name': 'simple_texture_2d_ppapi',
           'type': 'loadable_module',
           'variables': { 'chromium_code': 0, },
           'dependencies': [ 'gpu_demo_framework_ppapi', ],
           'sources': [
+            '<@(ppp_entrypoints_sources)',
             'gles2_book/example.h',
             'gles2_book/demo_simple_texture_2d.cc',
             '../../third_party/gles2_book/Chapter_9/Simple_Texture2D/Simple_Texture2D.c',
             '../../third_party/gles2_book/Chapter_9/Simple_Texture2D/Simple_Texture2D.h',
           ],
         },
         {
           'target_name': 'simple_texture_cubemap_ppapi',
           'type': 'loadable_module',
           'variables': { 'chromium_code': 0, },
           'dependencies': [ 'gpu_demo_framework_ppapi', ],
           'sources': [
+            '<@(ppp_entrypoints_sources)',
             'gles2_book/example.h',
             'gles2_book/demo_simple_texture_cubemap.cc',
             '../../third_party/gles2_book/Chapter_9/Simple_TextureCubemap/Simple_TextureCubemap.c',
             '../../third_party/gles2_book/Chapter_9/Simple_TextureCubemap/Simple_TextureCubemap.h',
           ],
         },
         {
           'target_name': 'simple_vertex_shader_ppapi',
           'type': 'loadable_module',
           'variables': { 'chromium_code': 0, },
           'dependencies': [ 'gpu_demo_framework_ppapi', ],
           'sources': [
+            '<@(ppp_entrypoints_sources)',
             'gles2_book/example.h',
             'gles2_book/demo_simple_vertex_shader.cc',
             '../../third_party/gles2_book/Chapter_8/Simple_VertexShader/Simple_VertexShader.c',
             '../../third_party/gles2_book/Chapter_8/Simple_VertexShader/Simple_VertexShader.h',
           ],
         },
         {
           'target_name': 'stencil_test_ppapi',
           'type': 'loadable_module',
           'variables': { 'chromium_code': 0, },
           'dependencies': [ 'gpu_demo_framework_ppapi', ],
           'sources': [
+            '<@(ppp_entrypoints_sources)',
             'gles2_book/example.h',
             'gles2_book/demo_stencil_test.cc',
             '../../third_party/gles2_book/Chapter_11/Stencil_Test/Stencil_Test.c',
             '../../third_party/gles2_book/Chapter_11/Stencil_Test/Stencil_Test.h',
           ],
         },
         {
           'target_name': 'texture_wrap_ppapi',
           'type': 'loadable_module',
           'variables': { 'chromium_code': 0, },
           'dependencies': [ 'gpu_demo_framework_ppapi', ],
           'sources': [
+            '<@(ppp_entrypoints_sources)',
             'gles2_book/example.h',
             'gles2_book/demo_texture_wrap.cc',
             '../../third_party/gles2_book/Chapter_9/TextureWrap/TextureWrap.c',
             '../../third_party/gles2_book/Chapter_9/TextureWrap/TextureWrap.h',
           ],
         },
       ],
     }],
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: