summaryrefslogtreecommitdiffstats
path: root/o3d
diff options
context:
space:
mode:
authorkbr@google.com <kbr@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-28 01:44:55 +0000
committerkbr@google.com <kbr@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-28 01:44:55 +0000
commit387535c50eac25f6c47d99cae085a0ceb40efbe9 (patch)
treed9d5b738c53fdf2c524ab25e7df69faf134473df /o3d
parentf21b7281948a5d3c9899c72c81a6c0a6a37d59df (diff)
downloadchromium_src-387535c50eac25f6c47d99cae085a0ceb40efbe9.zip
chromium_src-387535c50eac25f6c47d99cae085a0ceb40efbe9.tar.gz
chromium_src-387535c50eac25f6c47d99cae085a0ceb40efbe9.tar.bz2
Fixed bug in naming of texCoord[0..7] parameters discovered by petersont.
BUG=none TEST=none TBR=amarinichev Review URL: http://codereview.chromium.org/1696015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45772 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d')
-rwxr-xr-xo3d/cg_to_glsl/convert.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/o3d/cg_to_glsl/convert.py b/o3d/cg_to_glsl/convert.py
index 31f3ddc..f7b54cd 100755
--- a/o3d/cg_to_glsl/convert.py
+++ b/o3d/cg_to_glsl/convert.py
@@ -18,7 +18,7 @@ import sys
#
# * changes 'uniform vecN var[N]' to 'uniform matN var';
#
-# * renames gl_Vertex and gl_MultiTexCoordN to position and texcoordN
+# * renames gl_Vertex and gl_MultiTexCoordN to position and texCoordN
# respectively and adds attribute declarations;
#
# * prints the results to standard output, separating them with SplitMarker
@@ -164,10 +164,10 @@ def fix_glsl_body(body, input_mapping):
for n in xrange(8):
if 'gl_MultiTexCoord%d' % n in body:
- # Change gl_MultiTexCoordN (0<=N<=7) to texcoordN and add attribute
+ # Change gl_MultiTexCoordN (0<=N<=7) to texCoordN and add attribute
# declaration.
- body = re.sub(r'\bgl_MultiTexCoord%d\b' % n, 'texcoord%d' % n, body)
- attributes.append('attribute vec4 texcoord%d;' % n)
+ body = re.sub(r'\bgl_MultiTexCoord%d\b' % n, 'texCoord%d' % n, body)
+ attributes.append('attribute vec4 texCoord%d;' % n)
# ATTRIBUTES_TO_SEMANTICS should have taken care of normals.
assert 'gl_Normal' not in body