Mesa (master): main: GL_ACTIVE_UNIFORM_BLOCK_MAX_NAME_LENGTH is about UBOS , not SSBOs

Iago Toral Quiroga itoral at kemper.freedesktop.org
Mon Oct 19 06:24:14 UTC 2015


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

Author: Iago Toral Quiroga <itoral at igalia.com>
Date:   Fri Oct 16 11:27:43 2015 +0200

main: GL_ACTIVE_UNIFORM_BLOCK_MAX_NAME_LENGTH is about UBOS, not SSBOs

Reviewed-by: Kristian Høgsberg <krh at bitplanet.net>
Reviewed-by: Marek Olšák <marek.olsak at amd.com>

---

 src/mesa/main/shaderapi.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c
index 26995ad..18e463d 100644
--- a/src/mesa/main/shaderapi.c
+++ b/src/mesa/main/shaderapi.c
@@ -713,10 +713,10 @@ get_programiv(struct gl_context *ctx, GLuint program, GLenum pname,
       if (!has_ubo)
          break;
 
-      for (i = 0; i < shProg->NumBufferInterfaceBlocks; i++) {
+      for (i = 0; i < shProg->NumUniformBlocks; i++) {
 	 /* Add one for the terminating NUL character.
 	  */
-	 const GLint len = strlen(shProg->BufferInterfaceBlocks[i].Name) + 1;
+	 const GLint len = strlen(shProg->UniformBlocks[i]->Name) + 1;
 
 	 if (len > max_len)
 	    max_len = len;




More information about the mesa-commit mailing list