Revert "mesa: Deal with size differences between GLuint and GLhandleARB in GetAttache...
authorJeremy Huddleston Sequoia <jeremyhu@apple.com>
Fri, 22 Jan 2016 21:02:01 +0000 (13:02 -0800)
committerJeremy Huddleston Sequoia <jeremyhu@apple.com>
Fri, 22 Jan 2016 21:02:01 +0000 (13:02 -0800)
This reverts commit 739ac3d39dacdede853d150b9903001524453330.

This will be done a differnet way.
See http://lists.freedesktop.org/archives/mesa-dev/2016-January/105642.html

src/mesa/main/shaderapi.c

index 5854369a28c7e0dce169742d89b4fdcacc25ec85..a988f41697bb1b16e743d282cdd4339f4d4cd15a 100644 (file)
@@ -1374,26 +1374,10 @@ _mesa_DetachShader(GLuint program, GLuint shader)
 
 void GLAPIENTRY
 _mesa_GetAttachedObjectsARB(GLhandleARB container, GLsizei maxCount,
-                            GLsizei * count, GLhandleARB * objARB)
+                            GLsizei * count, GLhandleARB * obj)
 {
-   int i;
-   GLuint *obj;
-
    GET_CURRENT_CONTEXT(ctx);
-
-   obj = calloc(maxCount, sizeof(GLuint));
-   if (!obj) {
-      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glGetAttachedObjectsARB");
-      return;
-   }
-
    get_attached_shaders(ctx, container, maxCount, count, obj);
-
-   for (i = 0 ; i < *count; i++) {
-      objARB[i] = (GLhandleARB)obj[i];
-   }
-
-   free(obj);
 }