diff options
| author | Jordan Justen <jordan.l.justen@intel.com> | 2012-12-30 00:40:00 -0800 |
|---|---|---|
| committer | Jordan Justen <jordan.l.justen@intel.com> | 2013-01-04 17:26:02 -0800 |
| commit | 5f96348c600f5c1c097425dc432307b8dad68765 (patch) | |
| tree | b397f7ebdd7a8cdb2b203279883f116cef3a5db8 | |
| parent | fe23a2c5e18988959e3c699ff0c695517e8f37e8 (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 <jordan.l.justen@intel.com>
| -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 9e74b1ec9ee..fb266db8927 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; |