diff options
| author | Jason Ekstrand <[email protected]> | 2015-06-23 18:05:25 -0700 |
|---|---|---|
| committer | Jason Ekstrand <[email protected]> | 2015-06-23 18:05:25 -0700 |
| commit | a62edcce4eb4c800d972817a20ee874bf2a2c3ef (patch) | |
| tree | 46083a8762d45a6c595c7aaee2bb1cd0fc36eb62 /src/mesa/main/texparam.c | |
| parent | 9b9f973ca6d3cc1ec5be27857def00a83c032464 (diff) | |
| parent | 6844d6b7f8398a25eff511541b187afeb1199ce0 (diff) | |
Merge remote-tracking branch 'mesa-public/master' into vulkan
Diffstat (limited to 'src/mesa/main/texparam.c')
| -rw-r--r-- | src/mesa/main/texparam.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/main/texparam.c b/src/mesa/main/texparam.c index b5d42d3047f..d74134f41b1 100644 --- a/src/mesa/main/texparam.c +++ b/src/mesa/main/texparam.c @@ -1709,7 +1709,7 @@ get_tex_parameterfv(struct gl_context *ctx, if (ctx->NewState & (_NEW_BUFFERS | _NEW_FRAG_CLAMP)) _mesa_update_state_locked(ctx); - if (_mesa_get_clamp_fragment_color(ctx)) { + if (_mesa_get_clamp_fragment_color(ctx, ctx->DrawBuffer)) { params[0] = CLAMP(obj->Sampler.BorderColor.f[0], 0.0F, 1.0F); params[1] = CLAMP(obj->Sampler.BorderColor.f[1], 0.0F, 1.0F); params[2] = CLAMP(obj->Sampler.BorderColor.f[2], 0.0F, 1.0F); |