diff options
Diffstat (limited to 'external/cairo/cairo/cairo.GL_RGBA.patch')
| -rw-r--r-- | external/cairo/cairo/cairo.GL_RGBA.patch | 29 |
1 files changed, 20 insertions, 9 deletions
diff --git a/external/cairo/cairo/cairo.GL_RGBA.patch b/external/cairo/cairo/cairo.GL_RGBA.patch index 5f50dd13ffa9..648448e9de92 100644 --- a/external/cairo/cairo/cairo.GL_RGBA.patch +++ b/external/cairo/cairo/cairo.GL_RGBA.patch @@ -1,9 +1,9 @@ --- misc/cairo-1.10.2/src/cairo-image-surface.c +++ misc/cairo-1.10.2/src/cairo-image-surface.c -@@ -92,11 +92,11 @@ - _cairo_format_from_pixman_format (pixman_format_code_t pixman_format) - { - switch (pixman_format) { +@@ -97,11 +97,11 @@ + return CAIRO_FORMAT_RGBA128F; + case PIXMAN_rgb_float: + return CAIRO_FORMAT_RGB96F; - case PIXMAN_a8r8g8b8: + case PIXMAN_a8b8g8r8: //tweaked return CAIRO_FORMAT_ARGB32; @@ -14,16 +14,27 @@ return CAIRO_FORMAT_RGB24; case PIXMAN_a8: return CAIRO_FORMAT_A8; -@@ -112,7 +112,7 @@ +@@ -109,7 +109,7 @@ + return CAIRO_FORMAT_A1; + case PIXMAN_r5g6b5: + return CAIRO_FORMAT_RGB16_565; +- case PIXMAN_r8g8b8: ++ case PIXMAN_b8g8r8: //tweaked + return CAIRO_FORMAT_RGB24_888; + #if PIXMAN_VERSION >= PIXMAN_VERSION_ENCODE(0,22,0) + case PIXMAN_r8g8b8a8: case PIXMAN_r8g8b8x8: +@@ -117,8 +117,8 @@ #if PIXMAN_VERSION >= PIXMAN_VERSION_ENCODE(0,27,2) case PIXMAN_a8r8g8b8_sRGB: #endif - case PIXMAN_a8b8g8r8: case PIXMAN_x8b8g8r8: +- case PIXMAN_b8g8r8: case PIXMAN_b5g6r5: + case PIXMAN_a8r8g8b8: case PIXMAN_x8r8g8b8: //tweaked - case PIXMAN_b8g8r8: case PIXMAN_b5g6r5: ++ case PIXMAN_r8g8b8: case PIXMAN_b5g6r5: case PIXMAN_a1r5g5b5: case PIXMAN_x1r5g5b5: case PIXMAN_a1b5g5r5: case PIXMAN_x1b5g5r5: case PIXMAN_a4r4g4b4: case PIXMAN_x4r4g4b4: -@@ -314,7 +314,7 @@ + case PIXMAN_a4b4g4r4: case PIXMAN_x4b4g4r4: case PIXMAN_r3g3b2: +@@ -320,7 +320,7 @@ ret = PIXMAN_a8; break; case CAIRO_FORMAT_RGB24: @@ -32,8 +43,8 @@ break; case CAIRO_FORMAT_RGB30: ret = PIXMAN_x2r10g10b10; -@@ -323,12 +323,12 @@ - ret = PIXMAN_r5g6b5; +@@ -335,12 +335,12 @@ + ret = PIXMAN_rgba_float; break; case CAIRO_FORMAT_RGB24_888: - ret = PIXMAN_r8g8b8; |