diff options
| author | marha <marha@users.sourceforge.net> | 2011-09-15 15:11:10 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-09-15 15:11:10 +0200 |
| commit | 4095d7af9f50126361eb7b0aeba6869786f63d5c (patch) | |
| tree | 949709675ee9efb10c9c65dc55615444d469e63a /mesalib/src/mesa/drivers/common | |
| parent | a0fc33d46dfe59745f22decb93fe147292335602 (diff) | |
| parent | 4420369d700d9db1563f8647e1889c6a0972ea2c (diff) | |
| download | vcxsrv-4095d7af9f50126361eb7b0aeba6869786f63d5c.tar.gz vcxsrv-4095d7af9f50126361eb7b0aeba6869786f63d5c.tar.bz2 vcxsrv-4095d7af9f50126361eb7b0aeba6869786f63d5c.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/mesa/drivers/common')
| -rw-r--r-- | mesalib/src/mesa/drivers/common/meta.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mesalib/src/mesa/drivers/common/meta.c b/mesalib/src/mesa/drivers/common/meta.c index 2ebcd35bd..482bd98a2 100644 --- a/mesalib/src/mesa/drivers/common/meta.c +++ b/mesalib/src/mesa/drivers/common/meta.c @@ -1569,10 +1569,10 @@ _mesa_meta_Clear(struct gl_context *ctx, GLbitfield buffers) /* vertex colors */ for (i = 0; i < 4; i++) { - verts[i].r = ctx->Color.ClearColorUnclamped[0]; - verts[i].g = ctx->Color.ClearColorUnclamped[1]; - verts[i].b = ctx->Color.ClearColorUnclamped[2]; - verts[i].a = ctx->Color.ClearColorUnclamped[3]; + verts[i].r = ctx->Color.ClearColor.f[0]; + verts[i].g = ctx->Color.ClearColor.f[1]; + verts[i].b = ctx->Color.ClearColor.f[2]; + verts[i].a = ctx->Color.ClearColor.f[3]; } /* upload new vertex data */ @@ -1679,7 +1679,7 @@ _mesa_meta_glsl_Clear(struct gl_context *ctx, GLbitfield buffers) _mesa_UseProgramObjectARB(clear->ShaderProg); _mesa_Uniform4fvARB(clear->ColorLocation, 1, - ctx->Color.ClearColorUnclamped); + ctx->Color.ClearColor.f); _mesa_BindVertexArray(clear->ArrayObj); _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, clear->VBO); |