Fix WebGL tests & Implement WebGLRenderingContext::{validateProgram, getProgramInfoLog, disableVertexAttribArray}. #13208

MortimerGoro · 2016-09-08T20:42:32Z

Implement WebGLRenderingContext::{validateProgram, getProgramInfoLog} and improve WebGL testcase to show shader link and validation errors.

./mach build -d does not report any errors
./mach test-tidy does not report any errors
These changes fix Implement WebGLRenderingContext::{validateProgram, getProgramInfoLog} #13199 (github issue number if applicable).

There are tests for these changes OR
These changes do not require tests because _____

This change is

highfive · 2016-09-08T20:42:39Z

Thanks for the pull request, and welcome! The Servo team is excited to review your changes, and you should hear from @larsbergstrom (or someone else) soon.

highfive · 2016-09-08T20:42:39Z

Heads up! This PR modifies the following files:

@KiChjang: components/script/dom/webglrenderingcontext.rs, components/script/dom/webidls/WebGLRenderingContext.webidl, components/script/dom/webglprogram.rs
@emilio: components/script/dom/webglrenderingcontext.rs, components/script/dom/webglprogram.rs

highfive · 2016-09-08T20:42:40Z

Warning

These commits modify script code, but no tests are modified. Please consider adding a test!

bors-servo · 2016-09-08T20:51:24Z

☔ The latest upstream changes (presumably #13198) made this pull request unmergeable. Please resolve the merge conflicts.

emilio · 2016-09-09T00:38:59Z

components/script/dom/webglrenderingcontext.rs

@@ -1293,6 +1293,11 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext {
    }

    // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.9
+    fn GetProgramInfoLog(&self, program: Option<&WebGLProgram>) -> Option<DOMString> {
+        program.and_then(|p| Some(p.get_info_log())).map(DOMString::from)


nit: This can be program.map(|p| p.get_info_log()).map(DOMString::from)

emilio · 2016-09-09T02:12:23Z

@bors-servo: r+

Thanks!

bors-servo · 2016-09-09T02:12:24Z

📌 Commit 600ac93 has been approved by emilio

nox · 2016-09-09T09:59:35Z

@bors-servo p=1

bors-servo · 2016-09-09T10:48:14Z

⌛ Testing commit 600ac93 with merge c83e3a4...

Implement WebGLRenderingContext::{validateProgram, getProgramInfoLog}.  Implement WebGLRenderingContext::{validateProgram, getProgramInfoLog} and improve WebGL testcase to show shader link and validation errors. ---  - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [X] These changes fix #13199 (github issue number if applicable).  - [X] There are tests for these changes OR - [ ] These changes do not require tests because _____   --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/13208)

bors-servo · 2016-09-09T12:37:13Z

💔 Test failed - mac-rel-wpt

larsbergstrom · 2016-09-09T16:58:00Z

Hrm, I've never seen this:

command timed out: 1200 seconds without output running ['./mach', 'test-wpt', '--release', '--processes', '8', '--log-raw', 'test-wpt.log', '--log-errorsummary', 'wpt-errorsummary.log'], attempting to kill

jdm · 2016-09-09T17:38:20Z

@bors-servo: retry

Intermittent timeout in wpt harness #13219

bors-servo · 2016-09-09T17:55:17Z

⌛ Testing commit 600ac93 with merge cc85d61...

Implement WebGLRenderingContext::{validateProgram, getProgramInfoLog}.  Implement WebGLRenderingContext::{validateProgram, getProgramInfoLog} and improve WebGL testcase to show shader link and validation errors. ---  - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [X] These changes fix #13199 (github issue number if applicable).  - [X] There are tests for these changes OR - [ ] These changes do not require tests because _____   --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/13208)

bors-servo · 2016-10-03T14:24:35Z

⌛ Testing commit 328dace with merge f9dfb5c...

Fix WebGL tests & Implement WebGLRenderingContext::{validateProgram, getProgramInfoLog, disableVertexAttribArray}.  Implement WebGLRenderingContext::{validateProgram, getProgramInfoLog} and improve WebGL testcase to show shader link and validation errors. ---  - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [X] These changes fix #13199 (github issue number if applicable).  - [X] There are tests for these changes OR - [ ] These changes do not require tests because _____   --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/13208)

larsbergstrom · 2016-10-03T16:15:21Z

@bors-servo force clean retry

infra

bors-servo · 2016-10-03T16:15:57Z

⌛ Testing commit 328dace with merge 2432b48...

Fix WebGL tests & Implement WebGLRenderingContext::{validateProgram, getProgramInfoLog, disableVertexAttribArray}.  Implement WebGLRenderingContext::{validateProgram, getProgramInfoLog} and improve WebGL testcase to show shader link and validation errors. ---  - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [X] These changes fix #13199 (github issue number if applicable).  - [X] There are tests for these changes OR - [ ] These changes do not require tests because _____   --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/13208)

bors-servo · 2016-10-03T16:16:01Z

💔 Test failed - linux-rel-wpt

larsbergstrom · 2016-10-03T16:17:46Z

@bors-servo retry

infra

Fix WebGL tests & Implement WebGLRenderingContext::{validateProgram, getProgramInfoLog, disableVertexAttribArray}.  Implement WebGLRenderingContext::{validateProgram, getProgramInfoLog} and improve WebGL testcase to show shader link and validation errors. ---  - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [X] These changes fix #13199 (github issue number if applicable).  - [X] There are tests for these changes OR - [ ] These changes do not require tests because _____   --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/13208)

bors-servo · 2016-10-03T16:32:18Z

⌛ Testing commit 328dace with merge 89d85ac...

bors-servo · 2016-10-03T17:36:17Z

💔 Test failed - linux-dev

MortimerGoro · 2016-10-03T21:39:12Z

Could you try again?

Linux:

Compiling stylo_tests v0.0.1 (file:///home/servo/buildbot/slave/linux-dev/build/tests/unit/stylo)
/home/servo/buildbot/slave/linux-dev/build/tests/unit/stylo/sanity_checks.rs:65:5: 65:84 error: couldn't read "/home/servo/buildbot/slave/linux-dev/build/tests/unit/stylo/../../../components/style/generated/gecko_pseudo_element_helper.rs": No such file or directory (os error 2)
/home/servo/buildbot/slave/linux-dev/build/tests/unit/stylo/sanity_checks.rs:65 include!("../../../components/style/generated/gecko_pseudo_element_helper.rs");
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
error: Could not compile stylo_tests.

To learn more, run the command again with --verbose.

Windows:

Running rustc C:\projects\servo\.cargo\registry\src\github.com-1ecc6299db9ec823\servo-skia-0.20130412.24\src\lib.rs --crate-name skia --crate-type lib -g -C metadata=821f6e887353da86 -C extra-filename=-821f6e887353da86 --out-dir C:\projects\servo\target\debug\deps --emit=dep-info,link -L dependency=C:\projects\servo\target\debug\deps --extern gleam=C:\projects\servo\target\debug\deps\libgleam-77c1dc4cf66c55c7.rlib --extern libc=C:\projects\servo\target\debug\deps\liblibc-1417726cb94dbc83.rlib --extern expat_sys=C:\projects\servo\target\debug\deps\libexpat_sys-b221d02da6c4f70a.rlib --extern euclid=C:\projects\servo\target\debug\deps\libeuclid-005c17dcf11976c9.rlib --extern glutin=C:\projects\servo\target\debug\deps\libglutin-f1caa1609717624f.rlib --cap-lints allow -W unused-extern-crates -L native=C:\projects\servo\target\debug\build\servo-skia-ba112d30f8f02d37\out/lib -l static=skia -l usp10 -l ole32 -L native=C:\projects\servo\target\debug\build\expat-sys-a8e6de2e5e1a3bbc\out\lib
error: failed to build archive: bad archive: permission denied
Build failed, waiting for other jobs to finish...
error: Could not compile servo-skia.

larsbergstrom · 2016-10-03T21:54:49Z

@bors-servo retry

infra

bors-servo · 2016-10-03T21:54:52Z

⌛ Testing commit 328dace with merge fc25138...

Fix WebGL tests & Implement WebGLRenderingContext::{validateProgram, getProgramInfoLog, disableVertexAttribArray}.  Implement WebGLRenderingContext::{validateProgram, getProgramInfoLog} and improve WebGL testcase to show shader link and validation errors. ---  - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [X] These changes fix #13199 (github issue number if applicable).  - [X] There are tests for these changes OR - [ ] These changes do not require tests because _____   --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/13208)

bors-servo · 2016-10-03T22:38:03Z

💔 Test failed - mac-rel-wpt2

emilio · 2016-10-04T02:20:02Z

@bors-servo: retry

Intermittent failure in /websockets/constructor/013.html #13535

bors-servo · 2016-10-04T02:20:04Z

⚡ Previous build results for arm32, arm64, linux-dev, linux-rel-css, linux-rel-wpt, mac-dev-unit, mac-rel-css, mac-rel-wpt1, windows-dev are reusable. Rebuilding only mac-rel-wpt2...

bors-servo · 2016-10-04T03:03:12Z

☀️ Test successful - arm32, arm64, linux-dev, linux-rel-css, linux-rel-wpt, mac-dev-unit, mac-rel-css, mac-rel-wpt1, mac-rel-wpt2, windows-dev

highfive assigned larsbergstrom Sep 8, 2016

highfive added the S-awaiting-review There is new code that needs to be reviewed. label Sep 8, 2016

highfive added the S-needs-rebase There are merge conflict errors. label Sep 8, 2016

MortimerGoro force-pushed the programinfolog branch from 9de072b to db8727a Compare September 8, 2016 21:33

emilio reviewed Sep 9, 2016
View reviewed changes

KiChjang removed the S-needs-rebase There are merge conflict errors. label Sep 9, 2016

highfive assigned emilio and unassigned larsbergstrom Sep 9, 2016

highfive added S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. and removed S-awaiting-review There is new code that needs to be reviewed. labels Sep 9, 2016

Ms2ger changed the title ~~Programinfolog~~ Implement WebGLRenderingContext::{validateProgram, getProgramInfoLog}. Sep 9, 2016

highfive added S-tests-failed The changes caused existing tests to fail. and removed S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. labels Sep 9, 2016

highfive added S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. and removed S-tests-failed The changes caused existing tests to fail. labels Sep 9, 2016

bors-servo mentioned this pull request Sep 9, 2016

Put back video metadata #13094

Merged

highfive added S-tests-failed The changes caused existing tests to fail. and removed S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. labels Oct 3, 2016

highfive added S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. and removed S-tests-failed The changes caused existing tests to fail. labels Oct 3, 2016

highfive added S-tests-failed The changes caused existing tests to fail. and removed S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. labels Oct 3, 2016

highfive added S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. and removed S-tests-failed The changes caused existing tests to fail. labels Oct 3, 2016

highfive added S-tests-failed The changes caused existing tests to fail. and removed S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. labels Oct 3, 2016

bors-servo merged commit 328dace into servo:master Oct 4, 2016

bors-servo mentioned this pull request Oct 4, 2016

webgl: Add vertexAttribPointer and disableVertexAttribArray support #13101

Closed

5 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix WebGL tests & Implement WebGLRenderingContext::{validateProgram, getProgramInfoLog, disableVertexAttribArray}. #13208

Fix WebGL tests & Implement WebGLRenderingContext::{validateProgram, getProgramInfoLog, disableVertexAttribArray}. #13208

MortimerGoro commented Sep 8, 2016 •

edited by larsbergstrom

Loading

highfive commented Sep 8, 2016

highfive commented Sep 8, 2016

highfive commented Sep 8, 2016

bors-servo commented Sep 8, 2016

emilio Sep 9, 2016

emilio commented Sep 9, 2016

bors-servo commented Sep 9, 2016

nox commented Sep 9, 2016

bors-servo commented Sep 9, 2016

bors-servo commented Sep 9, 2016

larsbergstrom commented Sep 9, 2016

jdm commented Sep 9, 2016

bors-servo commented Sep 9, 2016

bors-servo commented Oct 3, 2016

larsbergstrom commented Oct 3, 2016

bors-servo commented Oct 3, 2016

bors-servo commented Oct 3, 2016

larsbergstrom commented Oct 3, 2016

bors-servo commented Oct 3, 2016

bors-servo commented Oct 3, 2016

MortimerGoro commented Oct 3, 2016

larsbergstrom commented Oct 3, 2016

bors-servo commented Oct 3, 2016

bors-servo commented Oct 3, 2016

emilio commented Oct 4, 2016

bors-servo commented Oct 4, 2016

bors-servo commented Oct 4, 2016

Fix WebGL tests & Implement WebGLRenderingContext::{validateProgram, getProgramInfoLog, disableVertexAttribArray}. #13208

Fix WebGL tests & Implement WebGLRenderingContext::{validateProgram, getProgramInfoLog, disableVertexAttribArray}. #13208

Conversation

MortimerGoro commented Sep 8, 2016 • edited by larsbergstrom Loading

highfive commented Sep 8, 2016

highfive commented Sep 8, 2016

highfive commented Sep 8, 2016

bors-servo commented Sep 8, 2016

emilio Sep 9, 2016

Choose a reason for hiding this comment

emilio commented Sep 9, 2016

bors-servo commented Sep 9, 2016

nox commented Sep 9, 2016

bors-servo commented Sep 9, 2016

bors-servo commented Sep 9, 2016

larsbergstrom commented Sep 9, 2016

jdm commented Sep 9, 2016

bors-servo commented Sep 9, 2016

bors-servo commented Oct 3, 2016

larsbergstrom commented Oct 3, 2016

bors-servo commented Oct 3, 2016

bors-servo commented Oct 3, 2016

larsbergstrom commented Oct 3, 2016

bors-servo commented Oct 3, 2016

bors-servo commented Oct 3, 2016

MortimerGoro commented Oct 3, 2016

larsbergstrom commented Oct 3, 2016

bors-servo commented Oct 3, 2016

bors-servo commented Oct 3, 2016

emilio commented Oct 4, 2016

bors-servo commented Oct 4, 2016

bors-servo commented Oct 4, 2016

MortimerGoro commented Sep 8, 2016 •

edited by larsbergstrom

Loading