[Mesa-dev] [PATCH 05/15] mesa: Fix error condition for valid texture targets in glTexStorage* functions

[Jordan Justen]

On Fri, Jun 6, 2014 at 9:13 PM, Matt Turner <mattst88 at gmail.com> wrote:
> On Fri, Jun 6, 2014 at 4:57 PM, Anuj Phogat <anuj.phogat at gmail.com> wrote:
>> Fixes gles3 Khronos CTS test: texture_storage_texture_targets
>>
>> Cc: <mesa-stable at lists.freedesktop.org>
>> Signed-off-by: Anuj Phogat <anuj.phogat at gmail.com>
>> ---
>>  src/mesa/main/texstorage.c | 7 +++++++
>>  1 file changed, 7 insertions(+)
>>
>> diff --git a/src/mesa/main/texstorage.c b/src/mesa/main/texstorage.c
>> index 86c8f3c..44b5374 100644
>> --- a/src/mesa/main/texstorage.c
>> +++ b/src/mesa/main/texstorage.c
>> @@ -53,6 +53,13 @@
>>  static GLboolean
>>  legal_texobj_target(struct gl_context *ctx, GLuint dims, GLenum target)
>>  {
>> +   if (_mesa_is_gles3(ctx)
>> +       && target != GL_TEXTURE_2D
>> +       && target != GL_TEXTURE_CUBE_MAP
>> +       && target != GL_TEXTURE_3D
>> +       && target != GL_TEXTURE_2D_ARRAY)

I was hoping to find a concise spec ref. Closest I came up with was:
3.8.7 Texture Parameters: "target is the target, either TEXTURE_2D,
TEXTURE_3D, TEXTURE_2D_ARRAY, or TEXTURE_CUBE_MAP"

But, I think this code maybe applies to other non-TexParameter paths.

> Let's put && on the end of the previous line.

I agree, but with or without that changed:
Reviewed-by: Jordan Justen <jordan.l.justen at intel.com>