592103 - return null for invalid uniform locations

Status: RESOLVED FIXED

(Core :: Graphics: CanvasWebGL, defect)

Description

[Vladimir Vukicevic [:vlad] [:vladv] (needinfo me, slow to respond)]

Attachment: return null uniforms correctly

GL returns -1 when a uniform doesn't exist; we should be returning null.  Currently we end up creating a new uniform object for this, oops :)

Comment 1

[Bas Schouten (:bas.schouten)]

Comment on attachment 470617 [details] [diff] [review]
return null uniforms correctly

># HG changeset patch
># Parent 23189f13f77eb1fb3c31319463f79840b34e1f48
>diff --git a/content/canvas/src/WebGLContextGL.cpp b/content/canvas/src/WebGLContextGL.cpp
>--- a/content/canvas/src/WebGLContextGL.cpp
>+++ b/content/canvas/src/WebGLContextGL.cpp
>@@ -104,16 +104,21 @@ NS_IMETHODIMP WebGLContext::name(t1 a1, 
>     MakeContextCurrent(); gl->f##glname(a1,a2,a3,a4,a5,a6); return NS_OK; \
> }
> 
>-already_AddRefed<WebGLUniformLocation> WebGLProgram::GetUniformLocationObject(GLint glLocation)
>+already_AddRefed<WebGLUniformLocation>
>+WebGLProgram::GetUniformLocationObject(GLint glLocation)
> {
>     WebGLUniformLocation *existingLocationObject;
>     if (mMapUniformLocations.Get(glLocation, &existingLocationObject)) {
>         return existingLocationObject;
>-    } else {
>-        nsRefPtr<WebGLUniformLocation> loc = new WebGLUniformLocation(mContext, this, glLocation);
>-        mMapUniformLocations.Put(glLocation, loc);
>-        return loc.forget();
>     }
>+
>+    if (loc < 0) {

This looks like it should be glLocation. Looks good other than that.

Comment 2

[Vladimir Vukicevic [:vlad] [:vladv] (needinfo me, slow to respond)]

http://hg.mozilla.org/mozilla-central/rev/edf604a16b96