diff options
| author | marha <marha@users.sourceforge.net> | 2013-01-24 08:40:35 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-01-24 08:40:35 +0100 |
| commit | 3e3af07f7697e9d23dd62fcf8f3a055602ae3341 (patch) | |
| tree | 9ad4b80b0c4df6e2dae13cde8d248a72273f9aae /mesalib/src/mesa/main/pack.c | |
| parent | 7002c66cfba01e7d3b88dae498a195f78f0e83f5 (diff) | |
| parent | 06872e284da1c00ce03b234ca24aefeac64990d2 (diff) | |
| download | vcxsrv-3e3af07f7697e9d23dd62fcf8f3a055602ae3341.tar.gz vcxsrv-3e3af07f7697e9d23dd62fcf8f3a055602ae3341.tar.bz2 vcxsrv-3e3af07f7697e9d23dd62fcf8f3a055602ae3341.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig mesa pixman xkbcomp xserver git update 24 jan 2013
Conflicts:
mesalib/src/glsl/.gitignore
Diffstat (limited to 'mesalib/src/mesa/main/pack.c')
| -rw-r--r-- | mesalib/src/mesa/main/pack.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/mesalib/src/mesa/main/pack.c b/mesalib/src/mesa/main/pack.c index d6a97b35a..e00ae63fc 100644 --- a/mesalib/src/mesa/main/pack.c +++ b/mesalib/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 */ ; |