#42 glTexImage3D #30 strikes back

[noa body]

Ubuntu 18.04.2:
30

In file included from ../client/../ref_gl/r_local.h:58:0,
                 from ../client/cg_cin.c:25:
../client/../ref_gl/qgl.h:789:33: error: ‘glTexImage3D’ redeclared as different kind of symbol
 extern PFNGLTEXIMAGE3DPROC      glTexImage3D;
                                 ^~~~~~~~~~~~
In file included from /usr/include/GL/glu.h:38:0,
                 from ../client/../ref_gl/r_local.h:29,
                 from ../client/cg_cin.c:25:
/usr/include/GL/gl.h:1496:23: note: previous declaration of ‘glTexImage3D’ was here
 GLAPI void GLAPIENTRY glTexImage3D( GLenum target, GLint level,

This "rename" patch seems to work okay.:

Index: ref_gl/qgl.h
===================================================================
--- ref_gl/qgl.h    (revision 1162)
+++ ref_gl/qgl.h    (working copy)
@@ -786,7 +786,7 @@
 extern PFNGLMULTIDRAWELEMENTSPROC              glMultiDrawElements;
 extern PFNGLMULTIDRAWARRAYSPROC                glMultiDrawArrays;

-extern PFNGLTEXIMAGE3DPROC                     glTexImage3D;
+extern PFNGLTEXIMAGE3DPROC                     qglTexImage3D;

 #ifdef _WIN32

Index: ref_gl/r_main.c
===================================================================
--- ref_gl/r_main.c (revision 1162)
+++ ref_gl/r_main.c (working copy)
@@ -1825,7 +1825,7 @@
    qglGetIntegerv(GL_NUM_PROGRAM_BINARY_FORMATS, &gl_state.numFormats);
    qglGetIntegerv(GL_PROGRAM_BINARY_FORMATS, &gl_state.binaryFormats);


-   glTexImage3D =  (PFNGLTEXIMAGE3DPROC)   qwglGetProcAddress("glTexImage3D");                 
+   qglTexImage3D = (PFNGLTEXIMAGE3DPROC)   qwglGetProcAddress("glTexImage3D");                 

    gl_config.vendor_string                 = (const char*)qglGetString(GL_VENDOR);
    gl_config.renderer_string               = (const char*)qglGetString(GL_RENDERER);
Index: ref_gl/r_misc.c
===================================================================
--- ref_gl/r_misc.c (revision 1162)
+++ ref_gl/r_misc.c (working copy)
@@ -622,7 +622,7 @@
    qglTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_WRAP_T, GL_REPEAT);
    qglTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_WRAP_R, GL_REPEAT);


-   glTexImage3D(GL_TEXTURE_3D, 0, GL_RGB, LUTsize, LUTsize, LUTsize, 0, GL_RGB, GL_FLOAT, &lutData[0]);
+   qglTexImage3D(GL_TEXTURE_3D, 0, GL_RGB, LUTsize, LUTsize, LUTsize, 0, GL_RGB, GL_FLOAT, &lutData[0]);
 }


Index: ref_gl/r_qgl.c
===================================================================
--- ref_gl/r_qgl.c  (revision 1162)
+++ ref_gl/r_qgl.c  (working copy)
@@ -654,7 +654,7 @@

 PFNGLBINDTEXTUREUNITPROC               glBindTextureUnit       = NULL;

-PFNGLTEXIMAGE3DPROC                        glTexImage3D = NULL;
+PFNGLTEXIMAGE3DPROC                        qglTexImage3D = NULL;

 #ifdef _WIN32
 PFNWGLCREATECONTEXTATTRIBSARBPROC          qwglCreateContextAttribsARB = NULL;

[Kirk Barnes]

fixed