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

Side by Side Diff: samples/convolution.html

Issue 274042: Remove pack from calls to texture.getRenderSurface... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/o3d/
Patch Set: '' Created 11 years, 2 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 | « samples/beachdemo/beachdemo.js ('k') | samples/render-targets.html » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <!-- 1 <!--
2 Copyright 2009, Google Inc. 2 Copyright 2009, Google Inc.
3 All rights reserved. 3 All rights reserved.
4 4
5 Redistribution and use in source and binary forms, with or without 5 Redistribution and use in source and binary forms, with or without
6 modification, are permitted provided that the following conditions are 6 modification, are permitted provided that the following conditions are
7 met: 7 met:
8 8
9 * Redistributions of source code must retain the above copyright 9 * Redistributions of source code must retain the above copyright
10 notice, this list of conditions and the following disclaimer. 10 notice, this list of conditions and the following disclaimer.
(...skipping 215 matching lines...) Expand 10 before | Expand all | Expand 10 after
226 convEffect.loadFromFXString(convFXString); 226 convEffect.loadFromFXString(convFXString);
227 227
228 var convMaterial = g_pack.createObject('Material'); 228 var convMaterial = g_pack.createObject('Material');
229 convMaterial.drawList = viewInfo.performanceDrawList; 229 convMaterial.drawList = viewInfo.performanceDrawList;
230 convMaterial.effect = convEffect; 230 convMaterial.effect = convEffect;
231 convEffect.createUniformParameters(convMaterial); 231 convEffect.createUniformParameters(convMaterial);
232 return convMaterial; 232 return convMaterial;
233 } 233 }
234 234
235 function createRenderSurfaceSet(texture) { 235 function createRenderSurfaceSet(texture) {
236 var renderSurface = texture.getRenderSurface(0, g_pack); 236 var renderSurface = texture.getRenderSurface(0);
237 237
238 // Create the depth-stencil buffer required when rendering this pass. 238 // Create the depth-stencil buffer required when rendering this pass.
239 var depthSurface = g_pack.createDepthStencilSurface(RENDER_TARGET_WIDTH, 239 var depthSurface = g_pack.createDepthStencilSurface(RENDER_TARGET_WIDTH,
240 RENDER_TARGET_HEIGHT); 240 RENDER_TARGET_HEIGHT);
241 241
242 var renderSurfaceSet = g_pack.createObject('RenderSurfaceSet'); 242 var renderSurfaceSet = g_pack.createObject('RenderSurfaceSet');
243 renderSurfaceSet.renderSurface = renderSurface; 243 renderSurfaceSet.renderSurface = renderSurface;
244 renderSurfaceSet.renderDepthStencilSurface = depthSurface; 244 renderSurfaceSet.renderDepthStencilSurface = depthSurface;
245 renderSurfaceSet.parent = g_client.renderGraphRoot; 245 renderSurfaceSet.parent = g_client.renderGraphRoot;
246 return renderSurfaceSet; 246 return renderSurfaceSet;
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
388 } 388 }
389 389
390 // #o3d VertexShaderEntryPoint ConvolutionVS 390 // #o3d VertexShaderEntryPoint ConvolutionVS
391 // #o3d PixelShaderEntryPoint ConvolutionPS 391 // #o3d PixelShaderEntryPoint ConvolutionPS
392 // #o3d MatrixLoadOrder RowMajor 392 // #o3d MatrixLoadOrder RowMajor
393 </textarea> 393 </textarea>
394 </div> 394 </div>
395 </body> 395 </body>
396 396
397 </html> 397 </html>
OLDNEW
« no previous file with comments | « samples/beachdemo/beachdemo.js ('k') | samples/render-targets.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698