1264214 - webgl 1.0.3 conformance error: glsl/misc/shaders-with-name-conflicts.html

Status: RESOLVED FIXED

(Core :: Graphics: CanvasWebGL, defect)

Description

[Ethan Lin[:ethlin]]

FAIL [unexpected link status] shaders with conflicting uniform/attribute names should fail

Comment 1

[Ethan Lin[:ethlin]]

Attachment: Check conflicting name.

Check the conflicting name in LinkProgram.

Comment 2

[Kelsey Gilbert [:jgilbert]]

Comment on attachment 8740817 [details] [diff] [review]
Check conflicting name.

Review of attachment 8740817 [details] [diff] [review]:
-----------------------------------------------------------------

::: dom/canvas/WebGLProgram.cpp
@@ +227,5 @@
>          }
>  
> +        // Check if the uniform conflicting to attrib
> +        if (info->attribMap.find(baseUserName) != info->attribMap.end()) {
> +            return nullptr;

Do this in LinkProgram afterwards. It'll be more clear that way.
Also, when we find a conflict, we need to leave a note in the program link log so the dev knows what's wrong.

Comment 3

[Ethan Lin[:ethlin]]

Attachment: Check conflicting name.

Addressed jgilbert's comments.

Comment 4

[Kelsey Gilbert [:jgilbert]]

Comment on attachment 8741601 [details] [diff] [review]
Check conflicting name.

Review of attachment 8741601 [details] [diff] [review]:
-----------------------------------------------------------------

::: dom/canvas/WebGLProgram.cpp
@@ +957,5 @@
> +    if (LinkAndUpdate()) {
> +        // Check if the attrib name conflicting to uniform name
> +        for (auto& uniform : mMostRecentLinkInfo->uniformMap) {
> +            if (mMostRecentLinkInfo->attribMap.find(uniform.first) != mMostRecentLinkInfo->attribMap.end()) {
> +                mLinkLog.AssignLiteral("The attribute name conflicts with uniform name.");

Use nsPrintf[C]String to include the conflicting name.

Comment 5

[Ethan Lin[:ethlin]]

Attachment: Check conflicting name.

Address jgilbert's comment.

Comment 6

[Ethan Lin[:ethlin]]

Attachment: Check conflicting name.

The previous patch is wrong. This one is corrected.

Comment 7

[Kelsey Gilbert [:jgilbert]]

Comment on attachment 8744130 [details] [diff] [review]
Check conflicting name.

Review of attachment 8744130 [details] [diff] [review]:
-----------------------------------------------------------------

::: dom/canvas/WebGLProgram.cpp
@@ +955,5 @@
>      }
>  
> +    if (LinkAndUpdate()) {
> +        // Check if the attrib name conflicting to uniform name
> +        for (auto& uniform : mMostRecentLinkInfo->uniformMap) {

const auto&

Comment 8

[Ethan Lin[:ethlin]]

Attachment: Check conflicting name. (carry r+: jgilbert)

Address jgilbert's comment.

Comment 9

[Ethan Lin[:ethlin]]

Attachment: Check conflicting name. (carry r+: jgilbert)

Rebase to master.

Comment 10

[Ethan Lin[:ethlin]]

Attachment: Check conflicting name. (carry r+: jgilbert)

Fix a build error.

Comment 11

[Ethan Lin[:ethlin]]

Try server:
https://treeherder.mozilla.org/#/jobs?repo=try&revision=5752c8fdd784

Comment 12

[Pulsebot]

https://hg.mozilla.org/integration/mozilla-inbound/rev/286171389d12

Comment 13

[Sebastian Hengst [:aryx] (needinfo me if it's about an intermittent or backout)]

Backed out for unexpected passes in test_conformance__glsl__misc__shaders-with-name-conflicts.

Backout: https://hg.mozilla.org/integration/mozilla-inbound/rev/673b6e68925ebca7689072ed42587380ceef6149
Push with issues: https://treeherder.mozilla.org/#/jobs?repo=mozilla-inbound&revision=286171389d121ded03eb541974c58035836b96ad
Issue log: https://treeherder.mozilla.org/logviewer.html#?job_id=26731827&repo=mozilla-inbound

09:00:48     INFO -  605 INFO TEST-START | dom/canvas/test/webgl-conf/generated/test_conformance__glsl__misc__shaders-with-name-conflicts.html
09:00:49     INFO -  JavaScript warning: http://mochi.test:8888/tests/dom/canvas/test/webgl-conf/checkout/conformance/resources/webgl-test-utils.js, line 1287: Error: WebGL: Exceeded 16 live WebGL contexts for this principal, losing the least recently used one.
09:00:49     INFO -  WebGL(0x11cb8e000)::ForceLoseContext
09:00:49     INFO -  JavaScript warning: http://mochi.test:8888/tests/dom/canvas/test/webgl-conf/checkout/conformance/resources/glsl-conformance-test.js, line 169: Error: WebGL: linkProgram: Failed to link, leaving the following log:
09:00:49     INFO -  The uniform name (foo) conflicts with attribute name.
09:00:49     INFO -  606 INFO TEST-FAIL | dom/canvas/test/webgl-conf/generated/test_conformance__glsl__misc__shaders-with-name-conflicts.html | A valid string reason is expected
09:00:49     INFO -  607 INFO TEST-FAIL | dom/canvas/test/webgl-conf/generated/test_conformance__glsl__misc__shaders-with-name-conflicts.html | Reason cannot be empty
09:00:49     INFO -  608 INFO TEST-FAIL | dom/canvas/test/webgl-conf/generated/test_conformance__glsl__misc__shaders-with-name-conflicts.html | shaders with conflicting uniform/attribute names should fail
09:00:49     INFO -  609 INFO TEST-FAIL | dom/canvas/test/webgl-conf/generated/test_conformance__glsl__misc__shaders-with-name-conflicts.html | successfullyParsed is true
09:00:49     INFO -  610 INFO TEST-UNEXPECTED-PASS | dom/canvas/test/webgl-conf/generated/test_conformance__glsl__misc__shaders-with-name-conflicts.html | fail-if condition in manifest - We expected at least one failure

Comment 14

[Ethan Lin[:ethlin]]

It's because bug 1193526 upgrade to webgl conformance 1.0.3. I will remove the fail-if flag.

Comment 15

[Ethan Lin[:ethlin]]

Attachment: Check conflicting name. (carry r+: jgilbert)

Fix try server error.

Comment 16

[Ethan Lin[:ethlin]]

Attachment: Check conflicting name. (carry r+: jgilbert)

Fix try server error.

Comment 17

[Ethan Lin[:ethlin]]

try server:
https://treeherder.mozilla.org/#/jobs?repo=try&revision=6bf46ac2955b

Comment 18

[Pulsebot]

https://hg.mozilla.org/integration/mozilla-inbound/rev/b4dfa9f7f63c

Comment 19

[Wes Kocher (:KWierso) (Not reading bugmail; email directly if needed)]

https://hg.mozilla.org/mozilla-central/rev/b4dfa9f7f63c