diff options
| author | luchen@google.com <luchen@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-14 01:12:11 +0000 |
|---|---|---|
| committer | luchen@google.com <luchen@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-14 01:12:11 +0000 |
| commit | d89ea3ced6389f04190eaa5431d32f67bca0056d (patch) | |
| tree | c66dcde04e8e73c5d00d7f6fba92d485101e2ecd /o3d/samples/o3djs | |
| parent | 7f7506f4f67c880b033d723dd1b7c29eac30dfac (diff) | |
| download | chromium_src-d89ea3ced6389f04190eaa5431d32f67bca0056d.zip chromium_src-d89ea3ced6389f04190eaa5431d32f67bca0056d.tar.gz chromium_src-d89ea3ced6389f04190eaa5431d32f67bca0056d.tar.bz2 | |
Implemented error texture support in client and ParamArray class. Fixed bug in effect.js that broke checkerboard texture if running using CG shaders.
TODO: Still a bug with render surface sets; will file issue and tackle problem in separate CL.
Review URL: http://codereview.chromium.org/2803007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52248 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/samples/o3djs')
| -rw-r--r-- | o3d/samples/o3djs/effect.js | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/o3d/samples/o3djs/effect.js b/o3d/samples/o3djs/effect.js index 0d23889..c9b5548 100644 --- a/o3d/samples/o3djs/effect.js +++ b/o3d/samples/o3djs/effect.js @@ -617,16 +617,16 @@ o3djs.effect.buildCheckerShaderString = function() { var p = o3djs.effect; var varyingDecls = p.BEGIN_OUT_STRUCT + p.VARYING + p.FLOAT4 + ' ' + - p.VERTEX_VARYING_PREFIX + 'position' + + p.VARYING_DECLARATION_PREFIX + 'position' + p.semanticSuffix('POSITION') + ';\n' + p.VARYING + p.FLOAT2 + ' ' + - p.VERTEX_VARYING_PREFIX + 'texCoord' + + p.VARYING_DECLARATION_PREFIX + 'texCoord' + p.semanticSuffix('TEXCOORD0') + ';\n' + p.VARYING + p.FLOAT3 + ' ' + - p.VERTEX_VARYING_PREFIX + 'normal' + + p.VARYING_DECLARATION_PREFIX + 'normal' + p.semanticSuffix('TEXCOORD1') + ';\n' + p.VARYING + p.FLOAT3 + ' ' + - p.VERTEX_VARYING_PREFIX + 'worldPosition' + + p.VARYING_DECLARATION_PREFIX + 'worldPosition' + p.semanticSuffix('TEXCOORD2') + ';\n' + p.END_STRUCT; |