Revert "zink: always init bordercolor value for sampler"

This reverts commit 336dea90f0.

This change was incorrect for two reasons:

1. We already initialize this field on line 334
2. Unconditionally setting this to
   VK_BORDER_COLOR_FLOAT_TRANSPARENT_BLACK breaks rendering with e.g
   opaque white borders, because we've already matched those to a
   non-custom enum value first.

Reviewed-By: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12591>
This commit is contained in:
Erik Faye-Lund
2021-08-27 10:32:41 +02:00
committed by Marge Bot
parent bcd9db327d
commit 28b3563a95
+1 -2
View File
@@ -345,8 +345,7 @@ zink_create_sampler_state(struct pipe_context *pctx,
assert(check <= screen->info.border_color_props.maxCustomBorderColorSamplers);
} else
sci.borderColor = VK_BORDER_COLOR_FLOAT_TRANSPARENT_BLACK; // TODO with custom shader if we're super interested?
} else
sci.borderColor = VK_BORDER_COLOR_FLOAT_TRANSPARENT_BLACK;
}
sci.unnormalizedCoordinates = !state->normalized_coords;