Home Explore Help
Sign In
dustdfg
/
dragora
forked from dragora/dragora
Watch 1
Star 0
Fork 0
Files
Branch: master
Branches Tags
dragora
/
patches
/
freeglut
/
freeglut-3.2.1-gcc10_fix-1.patch

freeglut-3.2.1-gcc10_fix-1.patch 2.2 KB
Permalink History Raw

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354 
  1. Submitted By:            Pierre Labastie <pierre dot labastie at neuf dot fr>
    2. 

  2. Date:                    2020-05-19
    3. 

  3. Initial Package Version: 3.2.1
    4. 

  4. Upstream Status:         Committed
    5. 

  5. Origin:                  Upstream https://sourceforge.net/p/freeglut/code/1863/
    6. 

  6. Description:             Fixes "multiple defition" issues
    7. 

  7. 

  8. --- a/src/fg_gl2.c
    9. 

  9. +++ b/src/fg_gl2.c
    10. 

  10. @@ -26,6 +26,20 @@
    11. 

  11.  #include <GL/freeglut.h>
    12. 

  12.  #include "fg_internal.h"
    13. 

  13.  #include "fg_gl2.h"
    14. 

  14. +
    15. 

  15. +#ifndef GL_ES_VERSION_2_0
    16. 

  16. +/* GLES2 has the corresponding entry points built-in, and these fgh-prefixed
    17. 

  17. + * names are defined in fg_gl2.h header to reference them, for any other case,
    18. 

  18. + * define them as function pointers here.
    19. 

  19. + */
    20. 

  20. +FGH_PFNGLGENBUFFERSPROC fghGenBuffers;
    21. 

  21. +FGH_PFNGLDELETEBUFFERSPROC fghDeleteBuffers;
    22. 

  22. +FGH_PFNGLBINDBUFFERPROC fghBindBuffer;
    23. 

  23. +FGH_PFNGLBUFFERDATAPROC fghBufferData;
    24. 

  24. +FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC fghEnableVertexAttribArray;
    25. 

  25. +FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC fghDisableVertexAttribArray;
    26. 

  26. +FGH_PFNGLVERTEXATTRIBPOINTERPROC fghVertexAttribPointer;
    27. 

  27. +#endif
    28. 

  28.  
    29. 

  29.  void FGAPIENTRY glutSetVertexAttribCoord3(GLint attrib) {
    30. 

  30.    if (fgStructure.CurrentWindow != NULL)
    31. 

  31. --- a/src/fg_gl2.h
    32. 

  32. +++ b/src/fg_gl2.h
    33. 

  33. @@ -67,13 +67,13 @@
    34. 

  34.  typedef void (APIENTRY *FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC) (GLuint);
    35. 

  35.  typedef void (APIENTRY *FGH_PFNGLVERTEXATTRIBPOINTERPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer);
    36. 

  36.  
    37. 

  37. -FGH_PFNGLGENBUFFERSPROC fghGenBuffers;
    38. 

  38. -FGH_PFNGLDELETEBUFFERSPROC fghDeleteBuffers;
    39. 

  39. -FGH_PFNGLBINDBUFFERPROC fghBindBuffer;
    40. 

  40. -FGH_PFNGLBUFFERDATAPROC fghBufferData;
    41. 

  41. -FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC fghEnableVertexAttribArray;
    42. 

  42. -FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC fghDisableVertexAttribArray;
    43. 

  43. -FGH_PFNGLVERTEXATTRIBPOINTERPROC fghVertexAttribPointer;
    44. 

  44. +extern FGH_PFNGLGENBUFFERSPROC fghGenBuffers;
    45. 

  45. +extern FGH_PFNGLDELETEBUFFERSPROC fghDeleteBuffers;
    46. 

  46. +extern FGH_PFNGLBINDBUFFERPROC fghBindBuffer;
    47. 

  47. +extern FGH_PFNGLBUFFERDATAPROC fghBufferData;
    48. 

  48. +extern FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC fghEnableVertexAttribArray;
    49. 

  49. +extern FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC fghDisableVertexAttribArray;
    50. 

  50. +extern FGH_PFNGLVERTEXATTRIBPOINTERPROC fghVertexAttribPointer;
    51. 

  51.  
    52. 

  52.  #    endif
    53. 

  53.  
    54. 

  54.