diff options
| author | Carl Worth <[email protected]> | 2013-01-21 12:16:27 -0800 |
|---|---|---|
| committer | Carl Worth <[email protected]> | 2013-01-23 17:40:52 -0800 |
| commit | 570ed2be7d776211e1ca2a7a4c44ee6a1d141714 (patch) | |
| tree | 73bc8e5588c6b1d3547ebd48305213fa8fa90e8e /src/mesa/main | |
| parent | b961ba44ed01d4aa590609fc91ab1250ac7d9559 (diff) | |
ReadPixels: Force ALPHA to 1 while rebasing RGBA values for GL_RGB format
When performing a ReadPixels operation, we may be reading from a buffer that
stores alpha values, but that is actually representing a buffer with no alpha
channel. In this case, while rebasing the values, touch up all alpha values
read to 1.0.
This commit fixes the following piglit (sub) tests:
ARB_texture_float/fbo-colormask-formats
GL_RBG16F_ARB
EXT_texture_snorm/fbo-colormask-formats
GL_RGB16_SNORM
GL_RGB8_SNORM
GL_RGB_SNORM
It likely improves the results of other tests as well, but a PASS remains
elusive due to additional bugs.
Reviewed-by: Brian Paul <[email protected]>
Reviewed-by: Anuj Phogat <[email protected]>
Diffstat (limited to 'src/mesa/main')
| -rw-r--r-- | src/mesa/main/pack.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/mesa/main/pack.c b/src/mesa/main/pack.c index d6a97b35a11..e00ae63fc0a 100644 --- a/src/mesa/main/pack.c +++ b/src/mesa/main/pack.c @@ -6022,6 +6022,11 @@ _mesa_rebase_rgba_float(GLuint n, GLfloat rgba[][4], GLenum baseFormat) rgba[i][BCOMP] = 0.0F; } break; + case GL_RGB: + for (i = 0; i < n; i++) { + rgba[i][ACOMP] = 1.0F; + } + break; default: /* no-op */ ; @@ -6060,6 +6065,11 @@ _mesa_rebase_rgba_uint(GLuint n, GLuint rgba[][4], GLenum baseFormat) rgba[i][BCOMP] = 0; } break; + case GL_RGB: + for (i = 0; i < n; i++) { + rgba[i][ACOMP] = 1; + } + break; default: /* no-op */ ; |