diff options
| author | Jordan Justen <[email protected]> | 2013-01-02 22:32:47 -0800 |
|---|---|---|
| committer | Jordan Justen <[email protected]> | 2013-01-04 17:26:02 -0800 |
| commit | 787bbe65fffdad786e4af760fbd5612db97041a7 (patch) | |
| tree | f086b863914e514d0ddee0085389a055f2aeef99 | |
| parent | 5f96348c600f5c1c097425dc432307b8dad68765 (diff) | |
texstore argb2101010: merge GL_RGBA and GL_RGB cases
Signed-off-by: Jordan Justen <[email protected]>
| -rw-r--r-- | src/mesa/main/texstore.c | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c index 7511509377e..6627cf57c80 100644 --- a/src/mesa/main/texstore.c +++ b/src/mesa/main/texstore.c @@ -1714,18 +1714,23 @@ _mesa_texstore_argb2101010(TEXSTORE_PARAMS) srcPacking, ctx->_ImageTransferState); const GLfloat *src = tempImage; + GLushort aMask = 0; GLint img, row, col; if (!tempImage) return GL_FALSE; + if (srcFormat == GL_RGB) { + aMask = 0xffff; + } for (img = 0; img < srcDepth; img++) { GLubyte *dstRow = dstSlices[img]; - if (baseInternalFormat == GL_RGBA) { + if (baseInternalFormat == GL_RGBA || baseInternalFormat == GL_RGB) { for (row = 0; row < srcHeight; row++) { GLuint *dstUI = (GLuint *) dstRow; for (col = 0; col < srcWidth; col++) { GLushort a,r,g,b; UNCLAMPED_FLOAT_TO_USHORT(a, src[ACOMP]); + a = a | aMask; UNCLAMPED_FLOAT_TO_USHORT(r, src[RCOMP]); UNCLAMPED_FLOAT_TO_USHORT(g, src[GCOMP]); UNCLAMPED_FLOAT_TO_USHORT(b, src[BCOMP]); @@ -1734,20 +1739,6 @@ _mesa_texstore_argb2101010(TEXSTORE_PARAMS) } dstRow += dstRowStride; } - } else if (baseInternalFormat == GL_RGB) { - for (row = 0; row < srcHeight; row++) { - GLuint *dstUI = (GLuint *) dstRow; - for (col = 0; col < srcWidth; col++) { - GLushort r,g,b; - - UNCLAMPED_FLOAT_TO_USHORT(r, src[RCOMP]); - UNCLAMPED_FLOAT_TO_USHORT(g, src[GCOMP]); - UNCLAMPED_FLOAT_TO_USHORT(b, src[BCOMP]); - dstUI[col] = PACK_COLOR_2101010_US(0xffff, r, g, b); - src += 4; - } - dstRow += dstRowStride; - } } else { ASSERT(0); } |