[PATCH 0/1] MR9723: opengl32: Return the buffers when invalid draw/read buffer are used.

[Rémi Bernon]

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=59100

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/9723

[PATCH 1/1] opengl32: Return the buffers when invalid draw/read buffer are used.

[Rémi Bernon]

From: Rémi Bernon <rbernon(a)codeweavers.com>

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=59100
---
 dlls/opengl32/unix_wgl.c | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/dlls/opengl32/unix_wgl.c b/dlls/opengl32/unix_wgl.c
index 48884fef88f..806571aa859 100644
--- a/dlls/opengl32/unix_wgl.c
+++ b/dlls/opengl32/unix_wgl.c
@@ -1889,7 +1889,12 @@ static GLenum *set_default_fbo_draw_buffers( struct context *ctx, struct opengl_
     for (GLsizei i = 0; i < count; i++)
     {
         dst[i] = drawable_buffer_from_buffer( draw, src[i] );
-        if (src[i] && !dst[i]) WARN( "Invalid draw buffer #%d %#x for context %p\n", i, src[i], ctx );
+        if (src[i] && !dst[i])
+        {
+            WARN( "Invalid draw buffer #%d %#x for context %p\n", i, src[i], ctx );
+            dst[i] = src[i];
+            continue;
+        }
 
         if (i >= MAX_DRAW_BUFFERS) FIXME( "Needs %u draw buffers\n", i );
         else ctx->color_buffer.draw_buffers[i] = src[i];
@@ -1940,7 +1945,11 @@ void wrap_glNamedFramebufferDrawBuffers( TEB *teb, GLuint fbo, GLsizei n, const
 static GLenum set_default_fbo_draw_buffer( struct context *ctx, struct opengl_drawable *draw, GLint src )
 {
     GLenum dst = drawable_buffer_from_buffer( draw, src );
-    if (src && !dst) WARN( "Invalid draw buffer %#x for context %p\n", src, ctx );
+    if (src && !dst)
+    {
+        WARN( "Invalid draw buffer %#x for context %p\n", src, ctx );
+        return src;
+    }
     memset( ctx->color_buffer.draw_buffers, 0, sizeof(ctx->color_buffer.draw_buffers) );
     ctx->color_buffer.draw_buffers[0] = src;
     return dst;
@@ -1985,7 +1994,11 @@ void wrap_glNamedFramebufferDrawBuffer( TEB *teb, GLuint fbo, GLenum buf )
 static GLenum set_default_fbo_read_buffer( struct context *ctx, struct opengl_drawable *read, GLint src )
 {
     GLenum dst = drawable_buffer_from_buffer( read, src );
-    if (src && !dst) WARN( "Invalid read buffer %#x for context %p\n", src, ctx );
+    if (src && !dst)
+    {
+        WARN( "Invalid read buffer %#x for context %p\n", src, ctx );
+        return src;
+    }
     ctx->pixel_mode.read_buffer = src;
     return dst;
 }
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/9723