Skip to content

Commit da35120

Browse files
greggmanphemavax
authored andcommitted
more pref stuff
1 parent b37c146 commit da35120

File tree

5 files changed

+26
-10
lines changed

5 files changed

+26
-10
lines changed

js/perf-harness.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ const PerfHarness = (function(undefined) {
5656

5757
const accelerating = function() {
5858
if (highestElapsedTime > g.targetTime) {
59-
g.count -= g.velocity * 2;
59+
g.count = Math.max(g.count - g.velocity * 2, 1);
6060
//g.velocity = 100;//Math.max(1, g.velocity / 4 | 0);
6161
g.waitFrameCount = elapsedTimes.length * 2;
6262
state = waitingForStableFramerate;

lots-o-images/index.html

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,10 @@ <h1>Lots-O-Images benchmarks</h1>
2828

2929
<div><a href="lots-o-images-draw-elements.html">
3030
<img src="lots-o-images-draw-elements.png" /></a><br/>
31-
<a href="lots-o-images-draw-elements.html">Lots O Images - DrawElements</a>
31+
<a href="lots-o-images-draw-elements.html">Lots O Images - DrawElements {alpha:false, antialias:false}</a><br>
32+
<a href="lots-o-images-draw-elements.html=settings{alpha:true}">Lots O Images - DrawElements {alpha:true, antialias:false}</a><br>
33+
<a href="lots-o-images-draw-elements.html=settings{preserveDrawingBuffer:true}">Lots O Images - DrawElements {preserveDrawingBuffer: true, antialias:false}</a><br>
34+
<a href="lots-o-images-draw-elements.html=settings{antialias:true}">Lots O Images - DrawElements {antialias: true}</a><br>
3235
<p>This sample uses the standard drawElements function call, ones for each image quad.</p>
3336
</div>
3437
<hr/>
@@ -42,7 +45,10 @@ <h1>Lots-O-Images benchmarks</h1>
4245

4346
<div><a href="lots-o-images-buffer-data-opaque.html">
4447
<img src="lots-o-images-buffer-data-opaque.png" /></a><br/>
45-
<a href="lots-o-images-buffer-data-opaque.html">Lots O Images - BufferData Opaque</a>
48+
<a href="lots-o-images-buffer-data-opaque.html">Lots O Images - BufferData Opaque {alpha: false, antialias:false}</a><br>
49+
<a href="lots-o-images-buffer-data-opaque.html?settings={alpha:true}">Lots O Images - BufferData Opaque {alpha:true, antialias:false}</a><br>
50+
<a href="lots-o-images-buffer-data-opaque.html?settings={preserveDrawingBuffer:true}">Lots O Images - BufferData Opaque {preserveDrawingBuffer:true, antialias:false}</a><br>
51+
<a href="lots-o-images-buffer-data-opaque.html?settings={antialias:true}">Lots O Images - BufferData Opaque {antialias:true}</a><br>
4652
<p>This is the same as "Lots O Images - BufferData" above except blending is turned off since blending is expensive for the GPU.</p>
4753
</div>
4854
<hr/>

lots-o-images/lots-o-images-buffer-data-opaque.html

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -299,12 +299,15 @@
299299
setTargetFPS(targetFPS);
300300

301301
document.getElementById("title").innerHTML = document.getElementsByTagName("title")[0].innerHTML;
302-
303-
const q = window.location.search;
304-
const alpha = q.indexOf('alpha') >= 0;
305-
const antialias = q.indexOf('antialias') >= 0;
306302

307-
gl = tdl.webgl.setupWebGL(canvas, {alpha: alpha, antialias: antialias});
303+
const ctxOptions = {
304+
alpha: false,
305+
antialias: false,
306+
preserveDrawingBuffer: false,
307+
};
308+
tdl.misc.applyUrlSettings(ctxOptions);
309+
310+
gl = tdl.webgl.setupWebGL(canvas, ctxOptions);
308311
if (!gl) {
309312
return false;
310313
}

lots-o-images/lots-o-images-draw-elements.html

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,14 @@
256256

257257
document.getElementById("title").innerHTML = document.getElementsByTagName("title")[0].innerHTML;
258258

259-
gl = tdl.webgl.setupWebGL(canvas, {alpha:false, antialias:false});
259+
const ctxOptions = {
260+
alpha: false,
261+
antialias: false,
262+
preserveDrawingBuffer: false,
263+
};
264+
tdl.misc.applyUrlSettings(ctxOptions);
265+
266+
gl = tdl.webgl.setupWebGL(canvas, ctxOptions);
260267
if (!gl) {
261268
return false;
262269
}

lots-o-objects/lots-o-objects-draw-elements.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ var g_eyeRadius = 9;
2424
var g_maxObjects = 250000;
2525
var g_numObjects = 100;
2626
var g_modelsPerBlock = 50;
27-
var g_targetFrameRate = 60 - 2; // add some fudge so browser that runs at 58-59 can still run the test
27+
var g_targetFrameRate = 60 - 5; // add some fudge so browser that runs at 58-59 can still run the test
2828

2929
function CreateApp() {
3030
// Create Geometry.

0 commit comments

Comments
 (0)