Mesa (master): main: Clear shader program data whenever ProgramBinary is called

Timothy Arceri tarceri at kemper.freedesktop.org
Fri Dec 8 06:03:47 UTC 2017


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

Author: Jordan Justen <jordan.l.justen at intel.com>
Date:   Tue Nov  7 02:11:28 2017 -0800

main: Clear shader program data whenever ProgramBinary is called

The GL_ARB_get_program_binary extension spec says:

 "If ProgramBinary fails to load a binary, no error is generated, but
  any information about a previous link or load of that program object
  is lost."

v2:
 * Re-initialize shProg->data after clear. (Jordan)
   (Required after 6a72eba755fea15a0d97abb913a6315d9d32e274)

Signed-off-by: Jordan Justen <jordan.l.justen at intel.com>
Reviewed-by: Nicolai Hähnle <nicolai.haehnle at amd.com>

---

 src/mesa/main/shaderapi.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c
index 51031e12ec..4607cbb99b 100644
--- a/src/mesa/main/shaderapi.c
+++ b/src/mesa/main/shaderapi.c
@@ -2221,6 +2221,9 @@ _mesa_ProgramBinary(GLuint program, GLenum binaryFormat,
    if (!shProg)
       return;
 
+   _mesa_clear_shader_program_data(ctx, shProg);
+   shProg->data = _mesa_create_shader_program_data();
+
    /* Section 2.3.1 (Errors) of the OpenGL 4.5 spec says:
     *
     *     "If a negative number is provided where an argument of type sizei or




More information about the mesa-commit mailing list