summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Huddleston Sequoia <[email protected]>2016-01-22 13:02:01 -0800
committerJeremy Huddleston Sequoia <[email protected]>2016-01-22 13:02:01 -0800
commit7c99557f53b9109a777b771e3e6479862e556071 (patch)
treeec129b179fa7616550ee98535869fed70482a872
parent315cda671570a149af5117d9b265dc71396122ba (diff)
Revert "mesa: Deal with size differences between GLuint and GLhandleARB in GetAttachedObjectsARB"
This reverts commit 739ac3d39dacdede853d150b9903001524453330. This will be done a differnet way. See http://lists.freedesktop.org/archives/mesa-dev/2016-January/105642.html
-rw-r--r--src/mesa/main/shaderapi.c18
1 files changed, 1 insertions, 17 deletions
diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c
index 5854369a28c..a988f41697b 100644
--- a/src/mesa/main/shaderapi.c
+++ b/src/mesa/main/shaderapi.c
@@ -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);
}