Mesa (master): Revert "mesa: Deal with size differences between GLuint and GLhandleARB in GetAttachedObjectsARB "
Jeremy Huddleston
jeremyhu at kemper.freedesktop.org
Fri Jan 22 21:02:47 UTC 2016
Module: Mesa
Branch: master
Commit: 7c99557f53b9109a777b771e3e6479862e556071
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=7c99557f53b9109a777b771e3e6479862e556071
Author: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date: Fri Jan 22 13:02:01 2016 -0800
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
---
src/mesa/main/shaderapi.c | 18 +-----------------
1 file changed, 1 insertion(+), 17 deletions(-)
diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c
index 5854369..a988f41 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);
}
More information about the mesa-commit
mailing list