diff options
| author | marha <marha@users.sourceforge.net> | 2012-10-26 08:13:08 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-10-26 08:13:08 +0200 |
| commit | af2d8fb974d476eadcd3cde3baebd038f5750600 (patch) | |
| tree | 9e24173d3f3dacb518a614984d26eaf7e87c7598 /mesalib/src/mesa | |
| parent | f6c8097ba5b5bb714185762dbd0ff9958d23e804 (diff) | |
| parent | 8d86f8c566c4181c846a872a5a2f88718e635a72 (diff) | |
| download | vcxsrv-af2d8fb974d476eadcd3cde3baebd038f5750600.tar.gz vcxsrv-af2d8fb974d476eadcd3cde3baebd038f5750600.tar.bz2 vcxsrv-af2d8fb974d476eadcd3cde3baebd038f5750600.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig pixman mesa git update 26 oct 2012
Diffstat (limited to 'mesalib/src/mesa')
| -rw-r--r-- | mesalib/src/mesa/state_tracker/st_cb_drawpixels.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mesalib/src/mesa/state_tracker/st_cb_drawpixels.c b/mesalib/src/mesa/state_tracker/st_cb_drawpixels.c index 4e2edd2e7..642011488 100644 --- a/mesalib/src/mesa/state_tracker/st_cb_drawpixels.c +++ b/mesalib/src/mesa/state_tracker/st_cb_drawpixels.c @@ -396,6 +396,8 @@ internal_format(struct gl_context *ctx, GLenum format, GLenum type) case GL_UNSIGNED_BYTE_3_3_2: case GL_UNSIGNED_BYTE_2_3_3_REV: + return GL_R3_G3_B2; + case GL_UNSIGNED_SHORT_4_4_4_4: case GL_UNSIGNED_SHORT_4_4_4_4_REV: return GL_RGBA4; |