Skip to content

Browser fixes #479

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

Merged
merged 42 commits into from
May 18, 2018
Merged

Browser fixes #479

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
beee719
Fix safari 0-data buffer setup
dy May 4, 2018
5339bf4
Fix extra logging
dy May 4, 2018
291fab9
Preinit texture with data
dy May 4, 2018
fc8c624
Remove extra comment
dy May 4, 2018
d8b91f5
Fix undefined Dtype
dy May 4, 2018
0b87f34
Add firefox interval timeout
dy May 4, 2018
9a7d9e5
Fix IE context creation
dy May 4, 2018
0703765
Merge branch 'master' into browser-fixes
dy May 14, 2018
16b7628
Use pool to preallocate texture
dy May 14, 2018
34d4b04
Fix test
dy May 14, 2018
50afc01
Add zero-pool for texture data
dy May 15, 2018
462f27c
Remove insignificant checks
dy May 15, 2018
be3326d
Move browser entry to tests
dy May 15, 2018
d18b56a
Move browser entry to test
dy May 15, 2018
1487bd6
Fix losing extension on context loss
dy May 15, 2018
127e0a0
Rename half_float to half_float_oes
dy May 15, 2018
85bef7d
Init zero-data texture on resize
dy May 15, 2018
23ba463
Ignore null allocation
dy May 15, 2018
b6f8d25
Revert test/index
dy May 15, 2018
9938a8e
Fix unsupported premultipliedAlpha in IE
dy May 15, 2018
54db288
Report a safari-specific test failure without halting all tests
May 14, 2018
202e395
Fix formatting
May 14, 2018
c6abb2e
1.3.2
dy May 16, 2018
0aa1b01
Fix links
dy May 16, 2018
d369dbf
Merge branch 'master' into browser-fixes
dy May 16, 2018
ac33e4f
Remove msg from code
dy May 16, 2018
449b5b5
Fix buffer test
dy May 16, 2018
1da66e1
Remove half float allocation - that breaks in safari
dy May 16, 2018
fc418cc
Unroll tests
dy May 16, 2018
0a82ba4
Fix safari framebuffer test
dy May 17, 2018
6afda7c
Display warning reading floats in contexts not supporting the feature
dy May 17, 2018
ad1c6ac
Rename mikolalysenko with regl-project
dy May 17, 2018
1a33343
Fix IE shader issues
dy May 17, 2018
3199462
Fix IE none colorspace test
dy May 17, 2018
617ff84
Add pow2 cube texture check
dy May 17, 2018
87e2ebf
Fix cube FBO test
dy May 17, 2018
b458147
Fix rest of IE tests
dy May 17, 2018
8addf24
Clean up
dy May 17, 2018
7745514
Move feature-detection to limits
dy May 18, 2018
0b31a64
Add API lines
dy May 18, 2018
71bba6c
Rename cubeNpot to npotCubeTexture
dy May 18, 2018
67d4cdd
Rename npotCubeTexture to npotTextureCube
dy May 18, 2018
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
18 changes: 1 addition & 17 deletions lib/texture.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,12 +365,6 @@ module.exports = function createTextureSet (
'rgb565': GL_UNSIGNED_SHORT_5_6_5,
'rgb5 a1': GL_UNSIGNED_SHORT_5_5_5_1
}
var textureDtypes = {
'uint8': Uint8Array,
'rgba4': Uint16Array,
'rgb565': Uint16Array,
'rgb5 a1': Uint16Array
}

var textureFormats = {
'alpha': GL_ALPHA,
Expand All @@ -392,12 +386,10 @@ module.exports = function createTextureSet (

if (extensions.oes_texture_float) {
textureTypes.float32 = textureTypes.float = GL_FLOAT
textureDtypes.float32 = Float32Array
}

if (extensions.oes_texture_half_float) {
textureTypes['float16'] = textureTypes['half float'] = GL_HALF_FLOAT_OES
textureDtypes.float16 = Uint16Array
}

if (extensions.webgl_depth_texture) {
Expand All @@ -411,11 +403,6 @@ module.exports = function createTextureSet (
'uint32': GL_UNSIGNED_INT,
'depth stencil': GL_UNSIGNED_INT_24_8_WEBGL
})

extend(textureDtypes, {
'uint16': Uint16Array,
'uint32': Uint32Array
})
}

if (extensions.webgl_compressed_texture_s3tc) {
Expand Down Expand Up @@ -854,10 +841,7 @@ module.exports = function createTextureSet (
target, miplevel, format, info.xOffset, info.yOffset, width, height, 0)
} else {
if (!data) {
Copy link
Contributor Author

@dy dy May 4, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Firefox requires texture to be init with data before subimage call, otherwise gives warning.

var Dtype = textureDtypes[textureTypesInvert[type]]
if (Dtype) {
data = new Dtype(width * height * channels)
}
data = pool.allocType(type, width * height * channels)
Copy link
Contributor Author

@dy dy May 14, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should really scope this to browsers that throw warning on null texture data. How do we do so?

Copy link
Contributor Author

@dy dy May 14, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should really scope this to browsers that throw warning on null texture data. How do we do so?

Copy link
Member

@rreusser rreusser May 14, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there any precedent for feature-detection in regl? Ideally I think we'd just feature-detect if it accepts null data since the result probably doesn't change.

Copy link
Contributor Author

@dy dy May 15, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unfortunately that is not an error but warning, there is no way to detect that via gl.getError or alike https://stackoverflow.com/questions/26400009/webgl-get-error-warning-message-text-as-a-string, so forcing null-data every time via zero pool seems reasonable solution. Is that indeed?

}
gl.texImage2D(
target, miplevel, format, width, height, 0, format, type, data)
Expand Down
14 changes: 8 additions & 6 deletions test/texture2d.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,8 @@ tape('texture 2d', function (t) {

var actual = regl.read()
for (i = 0; i < expected.length; ++i) {
if (!(Math.abs(actual[i] - expected[i]) <= tolerance)) {
// ignore null pixels as insignificant
if (expected[i] !== null && !(Math.abs(actual[i] - expected[i]) <= tolerance)) {
t.fail(name + ' @ index ' + i + ' ' + expected[i] + ' - ' + actual[i])
return
}
Expand Down Expand Up @@ -974,16 +975,17 @@ tape('texture 2d', function (t) {
width: 5,
height: 5,
pixels: [
255, 0, 0, 255, 255, 255, 255, 255, 0, 0, 0, 255, 0, 0, 0, 255, 0, 0, 0, 0,
255, 255, 255, 255, 255, 255, 255, 255, 0, 0, 0, 255, 0, 0, 0, 255, 0, 0, 0, 0,
0, 0, 0, 255, 0, 0, 0, 255, 0, 255, 0, 255, 0, 255, 0, 255, 0, 0, 0, 0,
0, 0, 0, 255, 0, 0, 0, 255, 0, 255, 0, 255, 0, 255, 0, 255, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
255, 0, 0, 255, 255, 255, 255, 255, 0, 0, 0, 255, 0, 0, 0, 255, null, null, null, null,
Copy link
Contributor Author

@dy dy May 14, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

null signifies insignificance

Copy link
Member

@rreusser rreusser May 14, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Noted in the comment above, so sounds good 👍

255, 255, 255, 255, 255, 255, 255, 255, 0, 0, 0, 255, 0, 0, 0, 255, null, null, null, null,
0, 0, 0, 255, 0, 0, 0, 255, 0, 255, 0, 255, 0, 255, 0, 255, null, null, null, null,
0, 0, 0, 255, 0, 0, 0, 255, 0, 255, 0, 255, 0, 255, 0, 255, null, null, null, null,
null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null
],
format: 'rgba',
type: 'uint8'
}, 'DOM image element - subimage')


endTest()
}

Expand Down