Bug 1290328 - Return null for webgl GetActiveUniformBlockName() error. r=jgilbert
authorJerryShih <hshih@mozilla.com>
Thu, 28 Jul 2016 18:21:00 -0400
changeset 349380 3776797b6c7154191ebd774005c01ad8bb2e654c
parent 349379 00970bf2151cd5ff60b08798063ae1d802c559d2
child 349381 5ad44f0d3ea46981d77e10563fe5c868384bfdc4
push id1230
push userjlund@mozilla.com
push dateMon, 31 Oct 2016 18:13:35 +0000
treeherdermozilla-release@5e06e3766db2 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjgilbert
bugs1290328
milestone50.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1290328 - Return null for webgl GetActiveUniformBlockName() error. r=jgilbert
dom/canvas/WebGL2ContextUniforms.cpp
--- a/dom/canvas/WebGL2ContextUniforms.cpp
+++ b/dom/canvas/WebGL2ContextUniforms.cpp
@@ -272,16 +272,17 @@ WebGL2Context::GetActiveUniformBlockPara
 
     ErrorInvalidEnumInfo("getActiveUniformBlockParameter: parameter", pname);
 }
 
 void
 WebGL2Context::GetActiveUniformBlockName(WebGLProgram* program, GLuint uniformBlockIndex,
                                          nsAString& retval)
 {
+    retval.SetIsVoid(true);
     if (IsContextLost())
         return;
 
     if (!ValidateObject("getActiveUniformBlockName: program", program))
         return;
 
     program->GetActiveUniformBlockName(uniformBlockIndex, retval);
 }