From: Tapani Pälli <tapani.palli@intel.com>
Date: Tue, 4 Aug 2015 08:09:35 +0000 (+0300)
Subject: mesa: do not modify args when errors with GetProgramResourceName
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=784bea5a38c219a5ab587ff1ddce8879d4f7dce1;p=mesa.git

mesa: do not modify args when errors with GetProgramResourceName

Original purpose of these lines was to be more friendly against
GUI tools using the extension. However conformance suite explicitly
checks that buffers are not modified in error conditions.

Fixes:
   ES31-CTS.program_interface_query.buff-length

Signed-off-by: Tapani Pälli <tapani.palli@intel.com>
Reviewed-by: Timothy Arceri <t_arceri@yahoo.com.au>
---

diff --git a/src/mesa/main/program_resource.c b/src/mesa/main/program_resource.c
index 3864775818c..23d2b4d2da0 100644
--- a/src/mesa/main/program_resource.c
+++ b/src/mesa/main/program_resource.c
@@ -274,12 +274,6 @@ _mesa_GetProgramResourceName(GLuint program, GLenum programInterface,
       _mesa_lookup_shader_program_err(ctx, program,
                                       "glGetProgramResourceName");
 
-   /* Set user friendly return values in case of errors. */
-   if (name)
-      *name = '\0';
-   if (length)
-      *length = 0;
-
    if (!shProg || !name)
       return;