Mesa (9.2): mesa: Don't return any data for GL_SHADER_BINARY_FORMATS

Carl Worth cworth at kemper.freedesktop.org
Fri Oct 4 22:13:23 UTC 2013


Module: Mesa
Branch: 9.2
Commit: 486aecac7eb0542981ae1191e6eee2c7a9d305d5
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=486aecac7eb0542981ae1191e6eee2c7a9d305d5

Author: Ian Romanick <ian.d.romanick at intel.com>
Date:   Thu Sep  5 12:47:13 2013 -0700

mesa: Don't return any data for GL_SHADER_BINARY_FORMATS

We return 0 for GL_NUM_SHADER_BINARY_FORMATS, so
GL_SHADER_BINARY_FORMATS should not write any data to the application
buffer.

Fixes piglit test 'arb_get_program_binary-overrun shader'.

Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Matt Turner <mattst88 at gmail.com>
(cherry picked from commit 0667e2c969c0931a1feee530508f8441a11bda32)

---

 src/mesa/main/get_hash_params.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/mesa/main/get_hash_params.py b/src/mesa/main/get_hash_params.py
index b9000e6..0c6184d 100644
--- a/src/mesa/main/get_hash_params.py
+++ b/src/mesa/main/get_hash_params.py
@@ -303,7 +303,7 @@ descriptor=[
   [ "MAX_VERTEX_UNIFORM_VECTORS", "LOC_CUSTOM, TYPE_INT, 0, extra_ARB_ES2_compatibility_api_es2" ],
   [ "MAX_FRAGMENT_UNIFORM_VECTORS", "LOC_CUSTOM, TYPE_INT, 0, extra_ARB_ES2_compatibility_api_es2" ],
   [ "NUM_SHADER_BINARY_FORMATS", "CONST(0), extra_ARB_ES2_compatibility_api_es2" ],
-  [ "SHADER_BINARY_FORMATS", "CONST(0), extra_ARB_ES2_compatibility_api_es2" ],
+  [ "SHADER_BINARY_FORMATS", "LOC_CUSTOM, TYPE_INVALID, 0, extra_ARB_ES2_compatibility_api_es2" ],
 
 # GL_ARB_get_program_binary / GL_OES_get_program_binary
   [ "NUM_PROGRAM_BINARY_FORMATS", "CONST(0), NO_EXTRA" ],




More information about the mesa-commit mailing list