[0.4.12][OPENGL32] Fix Red and Green Color Swap (#3478) CORE-16221
authorJoachim Henze <Joachim.Henze@reactos.org>
Sun, 23 Jan 2022 02:24:10 +0000 (03:24 +0100)
committerJoachim Henze <Joachim.Henze@reactos.org>
Sun, 23 Jan 2022 02:24:10 +0000 (03:24 +0100)
Fixes CORE-16221 "Shock-4Way3D (Virtual Desktops) - wrong background color"

It regressed by 0.4.12-dev-389-g 5f2bebf7a5b1a1602b553c43118d745e51c5609c

Fix picked from commit 0.4.15-dev-2085-g 834394abd9008a0ff53fb04359746d4b3200512b

dll/opengl/opengl32/swimpl.c

index 70b4ca7..15d307d 100644 (file)
@@ -1280,7 +1280,7 @@ static void read_color_span_##__bpp(GLcontext* ctx,
     {                                                                           \
         Buffer -= __pixel_size;                                                 \
         UNPACK_COLOR_##__bpp(GET_PIXEL_##__bpp((__type*)Buffer),                \
-                &blue[n], &green[n], &red[n]);                                  \
+                &red[n], &green[n], &blue[n]);                                  \
         alpha[n] = 0;                                                           \
     }                                                                           \
 }
@@ -1333,7 +1333,7 @@ static void read_color_pixels_##__bpp(GLcontext* ctx,
             BYTE *Buffer = fb->BackBuffer + y[n] * WIDTH_BYTES_ALIGN32(fb->width, __bpp)    \
                     + x[n] * __pixel_size;                                                  \
             UNPACK_COLOR_##__bpp(GET_PIXEL_##__bpp((__type*)Buffer),                        \
-                    &blue[n], &green[n], &red[n]);                                          \
+                    &red[n], &green[n], &blue[n]);                                          \
             alpha[n] = 0;                                                                   \
         }                                                                                   \
     }                                                                                       \