Mesa (master): mesa: do not modify args when errors with GetProgramResourceName

Tapani Pälli tpalli at kemper.freedesktop.org
Wed Aug 5 04:32:50 UTC 2015


Module: Mesa
Branch: master
Commit: 784bea5a38c219a5ab587ff1ddce8879d4f7dce1
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=784bea5a38c219a5ab587ff1ddce8879d4f7dce1

Author: Tapani Pälli <tapani.palli at intel.com>
Date:   Tue Aug  4 11:09:35 2015 +0300

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 at intel.com>
Reviewed-by: Timothy Arceri <t_arceri at yahoo.com.au>

---

 src/mesa/main/program_resource.c |    6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/mesa/main/program_resource.c b/src/mesa/main/program_resource.c
index 3864775..23d2b4d 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;
 




More information about the mesa-commit mailing list