fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-04 20:38:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

mesa: Deal with size differences between GLuint and GLhandleARB in GetAttachedObjectsARB

Browse source 
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
This commit is contained in:
Jeremy Huddleston Sequoia 2016-05-08 00:47:10 -07:00
parent 74d2456491
commit e7ef901650
1 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/mesa/main/shaderapi.c
View file

@ -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)
{
GET_CURRENT_CONTEXT(ctx);
get_attached_shaders(ctx, container, maxCount, count, obj);
get_attached_shaders(ctx, (GLuint)container, maxCount, count, NULL, obj);
}
@ -1584,7 +1592,7 @@ _mesa_GetAttachedShaders(GLuint program, GLsizei maxCount,
GLsizei *count, GLuint *obj)
{
GET_CURRENT_CONTEXT(ctx);
get_attached_shaders(ctx, program, maxCount, count, obj);
get_attached_shaders(ctx, program, maxCount, count, obj, NULL);
}