casa-mp-base

From a7f5cb4bdda7cae3a592093f4783399d1e5b6fa4 Mon Sep 17 00:00:00 2001

From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>

Date: Sun, 8 May 2016 00:47:10 -0700

Subject: [PATCH 4/4] mesa: Deal with size differences between GLuint and

 GLhandleARB in GetAttachedObjectsARB

MIME-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

​

Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>

CC: Nicolai Hähnle <nhaehnle@gmail.com>

CC: Matt Turner <mattst88@gmail.com>

CC: Ian Romanick <idr@freedesktop.org>

CC: Brian Paul <brianp@vmware.com>

---

 src/mesa/main/shaderapi.c | 22 +++++++++++++++-------

 1 file changed, 15 insertions(+), 7 deletions(-)

​

diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c

index 6dd617be7e..7282435583 100644

--- a/src/mesa/main/shaderapi.c

+++ b/src/mesa/main/shaderapi.c

@@ -513,10 +513,12 @@ detach_shader_no_error(struct gl_context *ctx, GLuint program, GLuint shader)

 /**

  * Return list of shaders attached to shader program.

+ * \param objOut  returns GLuint ids

+ * \param handleOut  returns GLhandleARB handles

  */

 static void

 get_attached_shaders(struct gl_context *ctx, GLuint program, GLsizei maxCount,

-                     GLsizei *count, GLuint *obj)

+                     GLsizei *countOut, GLuint *objOut, GLhandleARB *handleOut)

 {

    struct gl_shader_program *shProg;

@@ -531,14 +533,20 @@ get_attached_shaders(struct gl_context *ctx, GLuint program, GLsizei maxCount,

    if (shProg) {

       GLuint i;

       for (i = 0; i < (GLuint) maxCount && i < shProg->NumShaders; i++) {

-         obj[i] = shProg->Shaders[i]->Name;

+         if (objOut) {

+            objOut[i] = shProg->Shaders[i]->Name;

+         }

+

+         if (handleOut) {

+            handleOut[i] = (GLhandleARB) shProg->Shaders[i]->Name;

+         }

+      }

+      if (countOut) {

+         *countOut = i;

       }

-      if (count)

-         *count = i;

    }

 }

-

 /**

  * glGetHandleARB() - return ID/name of currently bound shader program.

  */

@@ -1575,7 +1583,7 @@ _mesa_GetAttachedObjectsARB(GLhandleARB container, GLsizei maxCount,

                             GLsizei * count, GLhandleARB * obj)