[Mesa-dev] [PATCH 1/2] mesa: GLES specifies restrictions on uniform matrix transpose.

[Brian Paul]

On 05/14/2012 07:45 AM, Oliver McFadden wrote:
> On Mon, May 14, 2012 at 07:26:10AM -0600, Brian Paul wrote:
>> On 05/14/2012 05:56 AM, Oliver McFadden wrote:
>>> GL_INVALID_VALUE is generated if transpose is not GL_FALSE.
>>>
>>> http://www.khronos.org/opengles/sdk/docs/man/xhtml/glUniform.xml
>>>
>>> Signed-off-by: Oliver McFadden<oliver.mcfadden at linux.intel.com>
>>> ---
>>>    src/mesa/main/uniform_query.cpp |   10 ++++++++++
>>>    1 files changed, 10 insertions(+), 0 deletions(-)
>>>
>>> diff --git a/src/mesa/main/uniform_query.cpp b/src/mesa/main/uniform_query.cpp
>>> index da41ee8..e8bdab2 100644
>>> --- a/src/mesa/main/uniform_query.cpp
>>> +++ b/src/mesa/main/uniform_query.cpp
>>> @@ -782,6 +782,16 @@ _mesa_uniform_matrix(struct gl_context *ctx, struct gl_shader_program *shProg,
>>>          return;
>>>       }
>>>
>>> +   /* GL_INVALID_VALUE is generated if `transpose' is not GL_FALSE.
>>> +    * http://www.khronos.org/opengles/sdk/docs/man/xhtml/glUniform.xml */
>>> +   if (ctx->API == API_OPENGLES || ctx->API == API_OPENGLES2) {
>>> +      if (bool(transpose)) {
>>
>> I don't think you need the bool() conversion there.
>
> Yes, you're right.
>
>>
>>
>>> +	      _mesa_error(ctx, GL_INVALID_VALUE,
>>> +			  "glUniformMatrix(matrix transpose is not GL_FALSE)");
>>> +	      return;
>>> +      }
>>> +   }
>>> +
>>
>> The indentation looks a bit off there.
>
> Yeah.  I need to fix the indent settings in my editor.
>
>>
>>>       if (ctx->Shader.Flags&   GLSL_UNIFORMS) {
>>>          log_uniform(values, GLSL_TYPE_FLOAT, components, vectors, count,
>>>    		  bool(transpose), shProg, location, uni);
>>
>> Otherwise, for both patches, Reviewed-by: Brian Paul<brianp at vmware.com>
>
> I'll send v2 patches with the issues fixed and your Reviewed-by added.
>

IMO, for trivial fixes like that you don't need to post v2 patches. 
Just commit with fixes.

-Brian