diff options
| author | marha <marha@users.sourceforge.net> | 2012-10-30 08:08:23 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-10-30 08:08:23 +0100 |
| commit | 7b3f315a5d8b90dcb0db5512ed91fa700027cb7a (patch) | |
| tree | 5d8a2f4983d9814c71325059d75e6de2af1a3b3e /mesalib/src/mesa/drivers/dri/swrast | |
| parent | 8d86f8c566c4181c846a872a5a2f88718e635a72 (diff) | |
| download | vcxsrv-7b3f315a5d8b90dcb0db5512ed91fa700027cb7a.tar.gz vcxsrv-7b3f315a5d8b90dcb0db5512ed91fa700027cb7a.tar.bz2 vcxsrv-7b3f315a5d8b90dcb0db5512ed91fa700027cb7a.zip | |
fontconfig xserver mesa git update 30 oct 2012
fontconfig: bdaef0b80dc27f4ab7a9d9bcedcfd8b5724b3cfd
xserver: 1ca096d5e07221025c4c4110528772b7d94f15ee
mesa: 0a66ced8f822b0d5478b0cd6d72c1a6ad70647a2
Diffstat (limited to 'mesalib/src/mesa/drivers/dri/swrast')
| -rw-r--r-- | mesalib/src/mesa/drivers/dri/swrast/swrast.c | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/mesalib/src/mesa/drivers/dri/swrast/swrast.c b/mesalib/src/mesa/drivers/dri/swrast/swrast.c index 7596973b0..eeeb81c01 100644 --- a/mesalib/src/mesa/drivers/dri/swrast/swrast.c +++ b/mesalib/src/mesa/drivers/dri/swrast/swrast.c @@ -125,8 +125,7 @@ swrastFillInModes(__DRIscreen *psp, __DRIconfig **configs; unsigned depth_buffer_factor; unsigned back_buffer_factor; - GLenum fb_format; - GLenum fb_type; + gl_format format; /* GLX_SWAP_COPY_OML is only supported because the Intel driver doesn't * support pageflipping at all. @@ -161,21 +160,14 @@ swrastFillInModes(__DRIscreen *psp, back_buffer_factor = 2; switch (pixel_bits) { - case 8: - fb_format = GL_RGB; - fb_type = GL_UNSIGNED_BYTE_2_3_3_REV; - break; case 16: - fb_format = GL_RGB; - fb_type = GL_UNSIGNED_SHORT_5_6_5; + format = MESA_FORMAT_RGB565; break; case 24: - fb_format = GL_BGR; - fb_type = GL_UNSIGNED_INT_8_8_8_8_REV; + format = MESA_FORMAT_XRGB8888; break; case 32: - fb_format = GL_BGRA; - fb_type = GL_UNSIGNED_INT_8_8_8_8_REV; + format = MESA_FORMAT_ARGB8888; break; default: fprintf(stderr, "[%s:%u] bad depth %d\n", __func__, __LINE__, @@ -183,7 +175,7 @@ swrastFillInModes(__DRIscreen *psp, return NULL; } - configs = driCreateConfigs(fb_format, fb_type, + configs = driCreateConfigs(format, depth_bits_array, stencil_bits_array, depth_buffer_factor, back_buffer_modes, back_buffer_factor, msaa_samples_array, 1, |