- const struct pipe_sampler_view *sv = NULL;
- union pipe_color_union border_color;
- GLuint i;
-
- /* Just search for the first used view. We can do this because the
- swizzle is per-texture, not per context. */
- /* XXX: clean that up to not use the sampler view at all */
- for (i = 0; i < stobj->num_sampler_views; ++i) {
- if (stobj->sampler_views[i]) {
- sv = stobj->sampler_views[i];
- break;
+ GLenum texBaseFormat = _mesa_base_tex_image(texobj)->_BaseFormat;
+
+ if (texobj->StencilSampling)
+ texBaseFormat = GL_STENCIL_INDEX;
+
+ if (st->apply_texture_swizzle_to_border_color) {
+ const struct st_texture_object *stobj = st_texture_object_const(texobj);
+ /* XXX: clean that up to not use the sampler view at all */
+ const struct st_sampler_view *sv = st_texture_get_current_sampler_view(st, stobj);
+
+ if (sv) {
+ struct pipe_sampler_view *view = sv->view;
+ union pipe_color_union tmp;
+ const unsigned char swz[4] =
+ {
+ view->swizzle_r,
+ view->swizzle_g,
+ view->swizzle_b,
+ view->swizzle_a,
+ };
+
+ st_translate_color(&msamp->BorderColor, &tmp,
+ texBaseFormat, is_integer);
+
+ util_format_apply_color_swizzle(&sampler->border_color,
+ &tmp, swz, is_integer);
+ } else {
+ st_translate_color(&msamp->BorderColor,
+ &sampler->border_color,
+ texBaseFormat, is_integer);