845636 - uniform1i should generate INVALID_VALUE for invalid texture units for samplers

Status: RESOLVED FIXED

(Core :: Graphics: CanvasWebGL, defect)

Description

[Kelsey Gilbert [:jgilbert]]

For uniforms that are samplers, we need to emit an INVALID_VALUE when the user tries to set them outside of [0, gl.getParameter(gl.MAX_COMBINED_TEXTURE_IMAGE_UNITS)).

Comment 1

[Kelsey Gilbert [:jgilbert]]

Attachment: patch

Comment 2

[Benoit Jacob [:bjacob] (mostly away)]

Comment on attachment 718796 [details] [diff] [review]
patch

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

r=me for the WebGL changes with the naming nit, but don't forget to take out the unwanted configure.in changes.

::: configure.in
@@ +480,1 @@
>          _CC_MAJOR_VERSION=`echo ${CC_VERSION} | $AWK -F\. '{ print $1 }'`

Unrelated configure.in changes.

::: content/canvas/src/WebGLContextValidate.cpp
@@ +688,5 @@
>      return true;
>  }
>  
>  bool
> +WebGLContext::ValidateUniformForSamplers(const char* info, WebGLUniformLocation *location, WebGLint value)

How about ValidateSamplerUniformSetter?

Comment 3

[Benoit Jacob [:bjacob] (mostly away)]

Comment on attachment 718796 [details] [diff] [review]
patch

forgot to r+; see important comment above.

Comment 4

[Kelsey Gilbert [:jgilbert]]

https://hg.mozilla.org/integration/mozilla-inbound/rev/40b1d8181e56

Comment 5

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/40b1d8181e56