Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions src/lib/libwebgl.js
Original file line number Diff line number Diff line change
Expand Up @@ -3224,7 +3224,7 @@ for (/**@suppress{duplicate}*/var i = 0; i <= {{{ GL_POOL_TEMP_BUFFERS_SIZE }}};
'__VERSION__': () => source.includes('#version 300') ? 300 : 100
});
#if GL_DEBUG
dbg(`Shader source after preprocessing: ${source}`;
dbg(`Shader source after preprocessing: ${source}`);
#endif
#endif // ~GL_EXPLICIT_UNIFORM_LOCATION || GL_EXPLICIT_UNIFORM_BINDING

Expand Down Expand Up @@ -3253,7 +3253,7 @@ for (/**@suppress{duplicate}*/var i = 0; i <= {{{ GL_POOL_TEMP_BUFFERS_SIZE }}};
GL.shaders[shader].explicitUniformLocations = explicitUniformLocations;

#if GL_DEBUG
dbg(`Shader source after removing layout location directives: ${source}`;
dbg(`Shader source after removing layout location directives: ${source}`);
dbg('Explicit uniform locations recorded in the shader:');
console.dir(explicitUniformLocations);
#endif
Expand Down Expand Up @@ -3314,7 +3314,7 @@ for (/**@suppress{duplicate}*/var i = 0; i <= {{{ GL_POOL_TEMP_BUFFERS_SIZE }}};
source = source.replace(/layout\s*\(\s*binding\s*=\s*([-\d]+)\s*,\s*(.*?)\)/g, 'layout($2)'); // "layout(binding = 1, std140)" -> "layout(std140)"

#if GL_DEBUG
dbg(`Shader source after removing layout binding directives: ${source}`;
dbg(`Shader source after removing layout binding directives: ${source}`);
dbg('Sampler binding locations recorded in the shader:');
console.dir(samplerBindings);
dbg('Uniform binding locations recorded in the shader:');
Expand Down
2 changes: 1 addition & 1 deletion test/test_browser.py
Original file line number Diff line number Diff line change
Expand Up @@ -2664,7 +2664,7 @@ def test_html5_webgl_api(self, args):
def test_webgl_preprocessor_variables(self, opts):
if '-DWEBGL_VERSION=2' in opts and webgl2_disabled():
self.skipTest('This test requires WebGL2 to be available')
self.btest_exit('webgl_preprocessor_variables.c', cflags=['-lGL'] + opts)
self.btest_exit('webgl_preprocessor_variables.c', cflags=['-lGL', '-sGL_DEBUG'] + opts)

@requires_graphics_hardware
def test_webgl2_ubos(self):
Expand Down
Loading