summaryrefslogtreecommitdiffstats
path: root/gpu/demos
diff options
context:
space:
mode:
authordpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-19 05:15:07 +0000
committerdpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-19 05:15:07 +0000
commit7522541294ad54bc38cf2871f5b23de399dd198d (patch)
tree585da21c1e21ccbf2705a5c07964a97959df2167 /gpu/demos
parent3189013eebc55ea5493186b29f2cee2bc7c0dafc (diff)
downloadchromium_src-7522541294ad54bc38cf2871f5b23de399dd198d.zip
chromium_src-7522541294ad54bc38cf2871f5b23de399dd198d.tar.gz
chromium_src-7522541294ad54bc38cf2871f5b23de399dd198d.tar.bz2
This change makes gles2_c_lib work as a component. It introduces a gles2_c_lib_export.h file, and ensures that all of the GL shim symbols are exported properly.
This also fixes a couple of prototype issues in glTexStorage2DEXT and glEnableFeatureCHROMIUM along the way. R=gman@chromium.org TEST=waterfall, specifically platform/chromium/compositing/accelerated-drawing tests don't crash Review URL: https://chromiumcodereview.appspot.com/8956051 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118240 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/demos')
-rw-r--r--gpu/demos/demos.gyp3
1 files changed, 2 insertions, 1 deletions
diff --git a/gpu/demos/demos.gyp b/gpu/demos/demos.gyp
index 6292564..59800c8c 100644
--- a/gpu/demos/demos.gyp
+++ b/gpu/demos/demos.gyp
@@ -1,4 +1,4 @@
-# Copyright (c) 2011 The Chromium Authors. All rights reserved.
+# Copyright (c) 2012 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.
@@ -41,6 +41,7 @@
'gpu_demo_framework',
'../gpu.gyp:command_buffer_client',
'../gpu.gyp:command_buffer_service',
+ '../gpu.gyp:gles2_implementation',
'../../base/base.gyp:base',
'../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
'../../ui/ui.gyp:ui',