0066-mesa-partially-revert-pbuffer-attribute-removal.patch 2.1 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657
  1. From 61e1720715598622318c7763f22f5d0e10fbca74 Mon Sep 17 00:00:00 2001
  2. From: brendan King <Brendan.King@imgtec.com>
  3. Date: Thu, 16 Sep 2021 17:46:28 +0100
  4. Subject: [PATCH] mesa: partially revert pbuffer attribute removal
  5. This partially reverts commit 5ffd1ebe6b3c8c7dd316dd47fac088044222e6ef
  6. ("mesa: Remove misc pbuffer attributes from struct gl_config").
  7. The IMG PowerVR driver sets meaningful values for the maximum
  8. pbuffer width, height and pixels.
  9. ---
  10. src/mesa/drivers/dri/common/utils.c | 7 ++++---
  11. src/mesa/main/mtypes.h | 5 +++++
  12. 2 files changed, 9 insertions(+), 3 deletions(-)
  13. diff --git a/src/mesa/drivers/dri/common/utils.c b/src/mesa/drivers/dri/common/utils.c
  14. index df5f8cb..28debe4 100644
  15. --- a/src/mesa/drivers/dri/common/utils.c
  16. +++ b/src/mesa/drivers/dri/common/utils.c
  17. @@ -480,6 +480,7 @@ __DRIconfig **driConcatConfigs(__DRIconfig **a,
  18. return all;
  19. }
  20. +/* careful, lack of trailing semicolon */
  21. #define __ATTRIB(attrib, field) case attrib: *value = config->modes.field; break
  22. /**
  23. @@ -555,9 +556,9 @@ driGetConfigAttribIndex(const __DRIconfig *config,
  24. __ATTRIB(__DRI_ATTRIB_GREEN_MASK, greenMask);
  25. __ATTRIB(__DRI_ATTRIB_BLUE_MASK, blueMask);
  26. __ATTRIB(__DRI_ATTRIB_ALPHA_MASK, alphaMask);
  27. - case __DRI_ATTRIB_MAX_PBUFFER_WIDTH:
  28. - case __DRI_ATTRIB_MAX_PBUFFER_HEIGHT:
  29. - case __DRI_ATTRIB_MAX_PBUFFER_PIXELS:
  30. + __ATTRIB(__DRI_ATTRIB_MAX_PBUFFER_WIDTH, maxPbufferWidth);
  31. + __ATTRIB(__DRI_ATTRIB_MAX_PBUFFER_HEIGHT, maxPbufferHeight);
  32. + __ATTRIB(__DRI_ATTRIB_MAX_PBUFFER_PIXELS, maxPbufferPixels);
  33. case __DRI_ATTRIB_OPTIMAL_PBUFFER_WIDTH:
  34. case __DRI_ATTRIB_OPTIMAL_PBUFFER_HEIGHT:
  35. case __DRI_ATTRIB_VISUAL_SELECT_GROUP:
  36. diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
  37. index 8f77d4c..e37c61d 100644
  38. --- a/src/mesa/main/mtypes.h
  39. +++ b/src/mesa/main/mtypes.h
  40. @@ -175,6 +175,11 @@ struct gl_config
  41. /* ARB_multisample / SGIS_multisample */
  42. GLuint samples;
  43. + /* GLX 1.3 */
  44. + GLint maxPbufferWidth;
  45. + GLint maxPbufferHeight;
  46. + GLint maxPbufferPixels;
  47. +
  48. /* OML_swap_method */
  49. GLint swapMethod;