Pushed, thanks.
On Mon, Sep 18, 2017 at 6:26 PM, Nicholas Miell <nmi...@gmail.com> wrote:
> Tested with AMD's Anvil OutOfOrderRasterization demo on a RX 560.
>
> Signed-off-by: Nicholas Miell <nmi...@gmail.com>
> ---
> src/amd/vulkan/radv_device.c | 17 +++++++++++++++++
> src/amd/vulkan/radv_pipeline.c | 10 +++++++++-
> 2 files changed, 26 insertions(+), 1 deletion(-)
>
> diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c
> index e6d595dfbe5..49536851bae 100644
> --- a/src/amd/vulkan/radv_device.c
> +++ b/src/amd/vulkan/radv_device.c
> @@ -175,6 +175,14 @@ static const VkExtensionProperties
> common_device_extensions[] = {
> .specVersion = 1,
> },
> };
> +
> +static const VkExtensionProperties rasterization_order_extension[] ={
> + {
> + .extensionName = VK_AMD_RASTERIZATION_ORDER_EXTENSION_NAME,
> + .specVersion = 1,
> + },
> +};
> +
> static const VkExtensionProperties ext_sema_device_extensions[] = {
> {
> .extensionName = VK_KHR_EXTERNAL_SEMAPHORE_EXTENSION_NAME,
> @@ -339,6 +347,15 @@ radv_physical_device_init(struct radv_physical_device
> *device,
> if (result != VK_SUCCESS)
> goto fail;
>
> + if (device->rad_info.chip_class >= VI && device->rad_info.max_se >=
> 2) {
> + result = radv_extensions_register(instance,
> + &device->extensions,
> + rasterization_order_extension,
> +
> ARRAY_SIZE(rasterization_order_extension));
> + if (result != VK_SUCCESS)
> + goto fail;
> + }
> +
> if (device->rad_info.has_syncobj) {
> result = radv_extensions_register(instance,
> &device->extensions,
> diff --git a/src/amd/vulkan/radv_pipeline.c b/src/amd/vulkan/radv_pipeline.c
> index 91577402a2c..8f20e902800 100644
> --- a/src/amd/vulkan/radv_pipeline.c
> +++ b/src/amd/vulkan/radv_pipeline.c
> @@ -33,6 +33,7 @@
> #include "nir/nir.h"
> #include "nir/nir_builder.h"
> #include "spirv/nir_spirv.h"
> +#include "vk_util.h"
>
> #include <llvm-c/Core.h>
> #include <llvm-c/TargetMachine.h>
> @@ -1085,6 +1086,13 @@ radv_pipeline_init_multisample_state(struct
> radv_pipeline *pipeline,
> ms->pa_sc_mode_cntl_1 |=
> EG_S_028A4C_PS_ITER_SAMPLE(ps_iter_samples > 1);
> }
>
> + const struct VkPipelineRasterizationStateRasterizationOrderAMD
> *raster_order =
> + vk_find_struct_const(pCreateInfo->pRasterizationState->pNext,
> PIPELINE_RASTERIZATION_STATE_RASTERIZATION_ORDER_AMD);
> + if (raster_order && raster_order->rasterizationOrder ==
> VK_RASTERIZATION_ORDER_RELAXED_AMD) {
> + ms->pa_sc_mode_cntl_1 |=
> S_028A4C_OUT_OF_ORDER_PRIMITIVE_ENABLE(1) |
> + S_028A4C_OUT_OF_ORDER_WATER_MARK(0x7);
> + }
> +
> if (vkms) {
> if (vkms->alphaToCoverageEnable)
> blend->db_alpha_to_mask |=
> S_028B70_ALPHA_TO_MASK_ENABLE(1);
> @@ -1875,7 +1883,7 @@ radv_pipeline_init(struct radv_pipeline *pipeline,
> !ps->info.fs.writes_sample_mask)
> pipeline->graphics.blend.spi_shader_col_format =
> V_028714_SPI_SHADER_32_R;
> }
> -
> +
> unsigned z_order;
> pipeline->graphics.db_shader_control = 0;
> if (ps->info.fs.early_fragment_test || !ps->info.fs.writes_memory)
> --
> 2.13.5
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
