Re: [Mesa3d-dev] glMultiModeDrawArraysIBM

[Brian P. <br...@tu...>]

Ian Romanick wrote:
> Jon Smirl wrote:
> 
>> I think the definition in glext.h is wrong. It also looks like 
>> glapitemp.h was
>> edited instead of regenerated with python tool.
>>
>> Please excuse me if these changes are wrong but I needed them to be 
>> able to
>> compile.
>>
>> In file included from main/dispatch.c:87:
>> ../../src/mesa/glapi/glapitemp.h:4668: conflicting types for
>> `glMultiModeDrawArraysIBM'
>> ../../include/GL/glext.h:4557: previous declaration of
>> `glMultiModeDrawArraysIBM'
>> ../../src/mesa/glapi/glapitemp.h:4673: conflicting types for
>> `glMultiModeDrawElementsIBM'
>> ../../include/GL/glext.h:4558: previous declaration of
>> `glMultiModeDrawElementsIBM'
>> make[2]: *** [main/dispatch.o] Error 1
>>
>> I changed it to:
>> GLAPI void APIENTRY glMultiModeDrawArraysIBM (const GLenum *, const 
>> GLint *,
>> const GLsizei *, GLsizei, GLint);
>> GLAPI void APIENTRY glMultiModeDrawElementsIBM (const GLenum *, const 
>> GLsizei
>> *, GLenum, const GLvoid * const *, GLsizei, GLint);
>>
>> and I regenerated glapitemp.h
> 
> 
> glapitemp.h is generated from APIspec, which was modified.  I have 
> contacted Jon Leech at SGI about getting glext.h corrected.  For some 
> reason, even with the incorrect prototype in glext.h, my build didn't fail.

Hmmm, maybe your /usr/include/GL/glext.h was being used?


> I think we should just import the new gl.h / glext.h, then make the 
> changes to glext.h.  Thoughts?

I believe we've got the latest glext.h from www.opengl.org.  Jon's fix 
is correct.

I also regenerated the x86 and sparc assembly dispatch files from the 
new APIspec and checked them in.

-Brian