Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Check whether context is lost before gl.shaderSource(...). #9017

Merged
merged 2 commits into from
Nov 25, 2019
Merged

Check whether context is lost before gl.shaderSource(...). #9017

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aed7147
Check whether context is lost before `gl.shaderSource(...)`.
ansis Nov 22, 2019
1036087
fixup
ansis Nov 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions src/render/program.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ class Program<Us: UniformBindings> {
numAttributes: number;
fixedUniforms: Us;
binderUniforms: Array<BinderUniform>;
failedToCreate: boolean;

constructor(context: Context,
source: {fragmentSource: string, vertexSource: string},
Expand All @@ -44,12 +45,20 @@ class Program<Us: UniformBindings> {
const fragmentSource = defines.concat(prelude.fragmentSource, source.fragmentSource).join('\n');
const vertexSource = defines.concat(prelude.vertexSource, source.vertexSource).join('\n');
const fragmentShader = gl.createShader(gl.FRAGMENT_SHADER);
if (gl.isContextLost()) {
this.failedToCreate = true;
return;
}
gl.shaderSource(fragmentShader, fragmentSource);
gl.compileShader(fragmentShader);
assert(gl.getShaderParameter(fragmentShader, gl.COMPILE_STATUS), (gl.getShaderInfoLog(fragmentShader): any));
gl.attachShader(this.program, fragmentShader);

const vertexShader = gl.createShader(gl.VERTEX_SHADER);
if (gl.isContextLost()) {
this.failedToCreate = true;
return;
}
gl.shaderSource(vertexShader, vertexSource);
gl.compileShader(vertexShader);
assert(gl.getShaderParameter(vertexShader, gl.COMPILE_STATUS), (gl.getShaderInfoLog(vertexShader): any));
Expand Down Expand Up @@ -110,6 +119,8 @@ class Program<Us: UniformBindings> {

const gl = context.gl;

if (this.failedToCreate) return;

context.program.set(this.program);
context.setDepthMode(depthMode);
context.setStencilMode(stencilMode);
Expand Down