diff options
| author | Jordan Justen <[email protected]> | 2012-12-30 00:40:00 -0800 |
|---|---|---|
| committer | Jordan Justen <[email protected]> | 2013-01-14 20:52:19 -0800 |
| commit | 8443b59a5bca9d4e5a2f700fc3e181cf634ff2b7 (patch) | |
| tree | b9180cf283afd6972f62f608976397c25fb2a0e6 /src | |
| parent | 80784066cca39ddd79420c32de7770317d56cdf8 (diff) | |
pack: handle GL_RGB+GL_UNSIGNED_INT_2_10_10_10_REV case
For floats, if GL_RGB is the source, then alpha should be set to
1.0F.
Signed-off-by: Jordan Justen <[email protected]>
Reviewed-by: Ian Romanick <[email protected]>
Diffstat (limited to 'src')
| -rw-r--r-- | src/mesa/main/pack.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/mesa/main/pack.c b/src/mesa/main/pack.c index 4f0caa7636c..d6a97b35a11 100644 --- a/src/mesa/main/pack.c +++ b/src/mesa/main/pack.c @@ -3641,7 +3641,11 @@ extract_float_rgba(GLuint n, GLfloat rgba[][4], rgba[i][rDst] = ((p ) & 0x3ff) * rs; rgba[i][gDst] = ((p >> 10) & 0x3ff) * gs; rgba[i][bDst] = ((p >> 20) & 0x3ff) * bs; - rgba[i][aDst] = ((p >> 30) ) * as; + if (aSrc < 0) { + rgba[i][aDst] = 1.0F; + } else { + rgba[i][aDst] = (p >> 30) * as; + } } } else { @@ -3652,7 +3656,11 @@ extract_float_rgba(GLuint n, GLfloat rgba[][4], rgba[i][rDst] = ((p ) & 0x3ff) * rs; rgba[i][gDst] = ((p >> 10) & 0x3ff) * gs; rgba[i][bDst] = ((p >> 20) & 0x3ff) * bs; - rgba[i][aDst] = ((p >> 30) ) * as; + if (aSrc < 0) { + rgba[i][aDst] = 1.0F; + } else { + rgba[i][aDst] = (p >> 30) * as; + } } } break; |