Mesa (staging/22.1): glx: set max values for pbuffer width / height

[GitLab Mirror]

Module: Mesa
Branch: staging/22.1
Commit: 717d494d3110621fc98b7d6bbba8621d87eb6b86
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=717d494d3110621fc98b7d6bbba8621d87eb6b86

Author: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer at amd.com>
Date:   Fri May 13 14:31:53 2022 +0200

glx: set max values for pbuffer width / height

Without this change the values are always 0. This breaks
Maya which uses this value to create a pbuffer (and then
fails).

This commit is based on b91e1e38e87 which does the same
for EGL.

Cc: mesa-stable
Reviewed-by: Marek Olšák <marek.olsak at amd.com>
Reviewed-by: Adam Jackson <ajax at redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16496>
(cherry picked from commit 8779a5b84cefba11a8644be295973150ab3d630f)

---

 .pick_status.json   | 2 +-
 src/glx/glxconfig.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 50287f2c846..7dea608eb77 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -445,7 +445,7 @@
         "description": "glx: set max values for pbuffer width / height",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null
     },
diff --git a/src/glx/glxconfig.c b/src/glx/glxconfig.c
index f8dc3ce6086..e67d5fadf41 100644
--- a/src/glx/glxconfig.c
+++ b/src/glx/glxconfig.c
@@ -145,10 +145,10 @@ glx_config_get(struct glx_config * mode, int attribute, int *value_return)
       *value_return = mode->fbconfigID;
       return 0;
    case GLX_MAX_PBUFFER_WIDTH:
-      *value_return = mode->maxPbufferWidth;
+      *value_return = 4096; /* _EGL_MAX_PBUFFER_WIDTH */
       return 0;
    case GLX_MAX_PBUFFER_HEIGHT:
-      *value_return = mode->maxPbufferHeight;
+      *value_return = 4096; /* _EGL_MAX_PBUFFER_HEIGHT */
       return 0;
    case GLX_MAX_PBUFFER_PIXELS:
       *value_return = mode->maxPbufferPixels;