Changeset 55514 in webkit
- Timestamp:
- Mar 4, 2010 1:41:30 AM (14 years ago)
- Location:
- trunk
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r55513 r55514 1 2010-03-04 Vangelis Kokkevis <vangelis@chromium.org> 2 3 Reviewed by Oliver Hunt. 4 5 Update existing test to check that getUniformLocation() returns 6 null if the uniform requested is not found. 7 https://bugs.webkit.org/show_bug.cgi?id=34669 8 9 * fast/canvas/webgl/script-tests/uniform-location.js: 10 * fast/canvas/webgl/uniform-location-expected.txt: 11 1 12 2010-03-04 John Abd-El-Malek <jam@chromium.org> 2 13 -
trunk/LayoutTests/fast/canvas/webgl/script-tests/uniform-location.js
r51970 r55514 1 description("Tests calling WebGL APIs with objects from other contexts");1 description("Tests WebGL APIs related to shader uniforms"); 2 2 3 3 var contextA = create3DDebugContext(); … … 34 34 shouldBe("contextA.getUniform(programV, locationVec4)", "vec"); 35 35 36 shouldBeNull("contextA.getUniformLocation(programV, \"IDontExist\")"); 37 36 38 successfullyParsed = true; -
trunk/LayoutTests/fast/canvas/webgl/uniform-location-expected.txt
r51970 r55514 1 Tests calling WebGL APIs with objects from other contexts1 Tests WebGL APIs related to shader uniforms 2 2 3 3 On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". … … 16 16 PASS contextA.uniform4fv(locationVec4, vec) is undefined. 17 17 PASS contextA.getUniform(programV, locationVec4) is vec 18 PASS contextA.getUniformLocation(programV, "IDontExist") is null 18 19 PASS successfullyParsed is true 19 20 -
trunk/WebCore/ChangeLog
r55513 r55514 1 2010-03-04 Vangelis Kokkevis <vangelis@chromium.org> 2 3 Reviewed by Oliver Hunt. 4 5 getUniformLocation() now returns null if uniform requested 6 is not found. 7 https://bugs.webkit.org/show_bug.cgi?id=34669 8 9 Test:LayoutTests/fast/canvas/webgl/uniform-location.html 10 (added missing test) 11 12 * html/canvas/WebGLRenderingContext.cpp: 13 (WebCore::WebGLRenderingContext::getUniformLocation): 14 1 15 2010-03-04 John Abd-El-Malek <jam@chromium.org> 2 16 -
trunk/WebCore/html/canvas/WebGLRenderingContext.cpp
r55306 r55514 1400 1400 } 1401 1401 WebGLStateRestorer(this, false); 1402 return WebGLUniformLocation::create(program, m_context->getUniformLocation(program, name)); 1402 long uniformLocation = m_context->getUniformLocation(program, name); 1403 if (uniformLocation == -1) 1404 return 0; 1405 return WebGLUniformLocation::create(program, uniformLocation); 1403 1406 } 1404 1407
Note: See TracChangeset
for help on using the changeset viewer.