Skip to content

Commit 817b478

Browse files
committed
Renamed backend functions
1 parent cb51994 commit 817b478

3 files changed

Lines changed: 36 additions & 36 deletions

File tree

src/backend/mode_cpu.js

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
return temp;
1717
}
18-
18+
1919
function getArgumentType(arg) {
2020
if (Array.isArray(arg)) {
2121
return 'Array';
@@ -34,15 +34,15 @@
3434
/// @param opt The parameter object
3535
///
3636
/// @returns callable function if converted, else returns null
37-
GPU.prototype._backendFallback = function(kernel, opt) {
37+
GPU.prototype._mode_cpu = function(kernel, opt) {
3838
var gpu = this;
39-
39+
4040
function ret() {
4141
if (!opt.dimensions || opt.dimensions.length === 0) {
4242
if (arguments.length != 1) {
4343
throw "Auto dimensions only supported for kernels with only one input";
4444
}
45-
45+
4646
var argType = getArgumentType(arguments[0]);
4747
if (argType == "Array") {
4848
opt.dimensions = getDimensions(argType);
@@ -52,7 +52,7 @@
5252
throw "Auto dimensions not supported for input type: " + argType;
5353
}
5454
}
55-
55+
5656
var kernelArgs = [];
5757
for (var i=0; i<arguments.length; i++) {
5858
var argType = getArgumentType(arguments[i]);
@@ -64,21 +64,21 @@
6464
throw "Input type not supported: " + arguments[i];
6565
}
6666
}
67-
67+
6868
var threadDim = clone(opt.dimensions);
69-
69+
7070
while (threadDim.length < 3) {
7171
threadDim.push(1);
7272
}
73-
73+
7474
var ret = new Array(threadDim[2]);
7575
for (var i=0; i<threadDim[2]; i++) {
7676
ret[i] = new Array(threadDim[1]);
7777
for (var j=0; j<threadDim[1]; j++) {
7878
ret[i][j] = new Array(threadDim[0]);
7979
}
8080
}
81-
81+
8282
var canvas;
8383
var canvasCtx;
8484
var imageData;
@@ -87,12 +87,12 @@
8787
canvas = gpu.getCanvas('cpu');
8888
canvas.width = threadDim[0];
8989
canvas.height = threadDim[1];
90-
90+
9191
canvasCtx = canvas.getContext("2d");
9292
imageData = canvasCtx.createImageData(threadDim[0], threadDim[1]);
9393
data = new Uint8ClampedArray(threadDim[0]*threadDim[1]*4);
9494
}
95-
95+
9696
var ctx = {
9797
thread: {
9898
x: 0,
@@ -105,97 +105,97 @@
105105
z: threadDim[2]
106106
}
107107
};
108-
108+
109109
ctx.color = function(r, g, b, a) {
110110
if (a == undefined) {
111111
a = 1.0;
112112
}
113-
113+
114114
r = Math.floor(r * 255);
115115
g = Math.floor(g * 255);
116116
b = Math.floor(b * 255);
117117
a = Math.floor(a * 255);
118-
118+
119119
var width = ctx.dimensions.x;
120120
var height = ctx.dimensions.y;
121-
121+
122122
var x = ctx.thread.x;
123123
var y = height - ctx.thread.y - 1;
124-
124+
125125
var index = x + y*width;
126-
126+
127127
data[index*4+0] = r;
128128
data[index*4+1] = g;
129129
data[index*4+2] = b;
130130
data[index*4+3] = a;
131131
};
132-
132+
133133
for (ctx.thread.z=0; ctx.thread.z<threadDim[2]; ctx.thread.z++) {
134134
for (ctx.thread.y=0; ctx.thread.y<threadDim[1]; ctx.thread.y++) {
135135
for (ctx.thread.x=0; ctx.thread.x<threadDim[0]; ctx.thread.x++) {
136136
ret[ctx.thread.z][ctx.thread.y][ctx.thread.x] = kernel.apply(ctx, kernelArgs);
137137
}
138138
}
139139
}
140-
140+
141141
if (opt.graphical) {
142142
imageData.data.set(data);
143143
canvasCtx.putImageData(imageData, 0, 0);
144144
}
145-
145+
146146
if (opt.dimensions.length == 1) {
147147
ret = ret[0][0];
148148
} else if (opt.dimensions.length == 2) {
149149
ret = ret[0];
150150
}
151-
151+
152152
return ret;
153153
}
154-
154+
155155
ret.dimensions = function(dim) {
156156
opt.dimensions = dim;
157157
return ret;
158158
};
159-
159+
160160
ret.debug = function(flag) {
161161
opt.debug = flag;
162162
return ret;
163163
};
164-
164+
165165
ret.graphical = function(flag) {
166166
opt.graphical = flag;
167167
return ret;
168168
};
169-
169+
170170
ret.loopMaxIterations = function(max) {
171171
opt.loopMaxIterations = max;
172172
return ret;
173173
};
174-
174+
175175
ret.wraparound = function() {
176176
opt.wraparound = false;
177177
return ret;
178178
};
179-
179+
180180
ret.hardcodeConstants = function() {
181181
opt.hardcodeConstants = false;
182182
return ret;
183183
};
184-
184+
185185
ret.outputToTexture = function() {
186186
opt.outputToTexture = false;
187187
return ret;
188188
};
189-
189+
190190
ret.mode = function(mode) {
191191
opt.mode = mode;
192192
return gpu.createKernel(kernel, opt);
193193
};
194-
194+
195195
ret.getCanvas = function() {
196196
return gpu.getCanvas('cpu');
197197
};
198-
198+
199199
return ret;
200200
};
201201
})(GPU);

src/backend/mode_gpu.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@
142142
return key;
143143
}
144144

145-
GPU.prototype._backendGLSL = function(kernel, opt) {
145+
GPU.prototype._mode_gpu = function(kernel, opt) {
146146
var gpu = this;
147147
var gl = this.gl;
148148
var canvas = this.canvas;
@@ -511,7 +511,7 @@
511511
opt.graphical = flag;
512512
return ret;
513513
};
514-
514+
515515
ret.loopMaxIterations = function(max) {
516516
opt.loopMaxIterations = max;
517517
return ret;

src/gpu.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,18 +94,18 @@ var GPU = (function() {
9494
var mode = paramObj.mode && paramObj.mode.toLowerCase();
9595

9696
if ( mode == "cpu" ) {
97-
return this._backendFallback(kernel, paramObj);
97+
return this._mode_cpu(kernel, paramObj);
9898
}
9999

100100
//
101101
// Attempts to do the glsl conversion
102102
//
103103
try {
104-
return this._backendGLSL(kernel, paramObj);
104+
return this._mode_gpu(kernel, paramObj);
105105
} catch (e) {
106106
if ( mode != "gpu") {
107107
console.warning("Falling back to CPU!");
108-
return this._backendFallback(kernel, paramObj);
108+
return this._mode_cpu(kernel, paramObj);
109109
} else {
110110
throw e;
111111
}

0 commit comments

Comments
 (0)