Kezdőlap Felfedezés Súgó
Bejelentkezés
erkanisik
/
main
tükrözi: https://github.com/pisilinux/main.git
Figyelés 1
Kedvenc 0
Másolás 0
Fájlok Problémák 0 Wiki
Fa: 0a1fe6cac1
Branch-ok Tag-ek
main
/
kernel
/
drivers
/
module-fglrx
/
files
/
fglrx-fix-GL-redefines.patch

fglrx-fix-GL-redefines.patch 2.5 KB
Előzmények Nyers

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950 
  1. 

  2. Already defined in mesa
    3. 

  3. 

  4. Signed-off-by: Thomas Backlund <tmb@mageia.org>
    5. 

  5. 

  6. diff -Nurp fglrx-13.250.18.orig/common/usr/include/GL/glATI.h fglrx-13.250.18/common/usr/include/GL/glATI.h
    7. 

  7. --- fglrx-13.250.18.orig/common/usr/include/GL/glATI.h	2013-12-06 13:46:50.339162515 +0200
    8. 

  8. +++ fglrx-13.250.18/common/usr/include/GL/glATI.h	2013-12-06 13:51:18.621140440 +0200
    9. 

  9. @@ -5367,7 +5367,9 @@ typedef GLvoid (APIENTRY * PFNGLTEXRENDE
    10. 

  10.  #define GL_SAMPLE_MASK_VALUE                               0x8E52
    11. 

  11.  #define GL_MAX_SAMPLE_MASK_WORDS                           0x8E59
    12. 

  12.  #define GL_TEXTURE_2D_MULTISAMPLE                          0x9100
    13. 

  13. +#ifndef GL_PROXY_TEXTURE_2D_MULTISAMPLE
    14. 

  14.  #define GL_PROXY_TEXTURE_2D_MULTISAMPLE                    0X9101
    15. 

  15. +#endif
    16. 

  16.  #define GL_TEXTURE_2D_MULTISAMPLE_ARRAY                    0x9102
    17. 

  17.  #define GL_PROXY_TEXTURE_2D_MULTISAMPLE_ARRAY              0x9103
    18. 

  18.  #define GL_MAX_COLOR_TEXTURE_SAMPLES                       0x910E
    19. 

  19. @@ -5385,11 +5387,13 @@ typedef GLvoid (APIENTRY * PFNGLTEXRENDE
    20. 

  20.  #define GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE_ARRAY       0x910D
    21. 

  21.  
    22. 

  22.  typedef GLvoid (APIENTRY * PFNGLSAMPLEMASKIPROC) (GLuint index, GLbitfield value);
    23. 

  23. +#if 0
    24. 

  24.  typedef GLvoid (APIENTRY * PFNGLTEXIMAGE2DMULTISAMPLEPROC) (GLenum target, GLsizei samples, GLint internalformat, 
    25. 

  25.                                                              GLsizei width, GLsizei height, GLboolean fixedsamplelocations);
    26. 

  26. +
    27. 

  27.  typedef GLvoid (APIENTRY * PFNGLTEXIMAGE3DMULTISAMPLEPROC) (GLenum target, GLsizei samples, GLint internalformat, 
    28. 

  28.                                                              GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations); 
    29. 

  29. -
    30. 

  30. +#endif
    31. 

  31.  // GL_EXT_timer_query
    32. 

  32.  #define GL_TIME_ELAPSED_EXT               0x88BF
    33. 

  33.  
    34. 

  34. @@ -6006,6 +6010,7 @@ typedef GLvoid (APIENTRY * PFNGLDEBUGMES
    35. 

  35.  typedef GLvoid (APIENTRY * PFNGLDEBUGMESSAGECALLBACKARB)(GLvoid* callback, GLvoid* userParam);
    36. 

  36.  typedef GLuint (APIENTRY * PFNGLGETDEBUGMESSAGELOGARB)(GLuint count, GLsizei bufsize, GLenum* sources, GLenum* types, GLuint* ids, GLenum* severities, GLsizei* lengths, GLchar* messageLog);
    37. 

  37.  
    38. 

  38. +#if 0
    39. 

  39.  typedef void (APIENTRY *GLDEBUGPROCARB)(GLenum source,
    40. 

  40.                                          GLenum type,
    41. 

  41.                                          GLuint id,
    42. 

  42. @@ -6014,6 +6019,7 @@ typedef void (APIENTRY *GLDEBUGPROCARB)(
    43. 

  43.                                          const GLchar* message,
    44. 

  44.                                          GLvoid* userParam);
    45. 

  45.  // end ARB_debug_output
    46. 

  46. +#endif
    47. 

  47.  
    48. 

  48.  
    49. 

  49.  /* ARB_debug_group (KHR_debug) */
    50. 

  50.