Thanks!
Reviewed-by: Jason Ekstrand <ja...@jlekstrand.net>
On Thu, Aug 11, 2016 at 10:39 AM, Anuj Phogat <anuj.pho...@gmail.com> wrote:
> Suggested-by: Jason Ekstrand <ja...@jlekstrand.net>
> Signed-off-by: Anuj Phogat <anuj.pho...@gmail.com>
> ---
> src/intel/vulkan/genX_multisample.h | 95 ++++++++++++++++++++++++++++++
> +++++
> src/intel/vulkan/genX_pipeline_util.h | 35 ++-----------
> src/intel/vulkan/genX_state.c | 68 +++----------------------
> 3 files changed, 106 insertions(+), 92 deletions(-)
> create mode 100644 src/intel/vulkan/genX_multisample.h
>
> diff --git a/src/intel/vulkan/genX_multisample.h b/src/intel/vulkan/genX_
> multisample.h
> new file mode 100644
> index 0000000..0deb48f
> --- /dev/null
> +++ b/src/intel/vulkan/genX_multisample.h
> @@ -0,0 +1,95 @@
> +/*
> + * Copyright © 2016 Intel Corporation
> + *
> + * Permission is hereby granted, free of charge, to any person obtaining a
> + * copy of this software and associated documentation files (the
> "Software"),
> + * to deal in the Software without restriction, including without
> limitation
> + * the rights to use, copy, modify, merge, publish, distribute,
> sublicense,
> + * and/or sell copies of the Software, and to permit persons to whom the
> + * Software is furnished to do so, subject to the following conditions:
> + *
> + * The above copyright notice and this permission notice (including the
> next
> + * paragraph) shall be included in all copies or substantial portions of
> the
> + * Software.
> + *
> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
> EXPRESS OR
> + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
> MERCHANTABILITY,
> + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
> SHALL
> + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
> OTHER
> + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
> + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
> DEALINGS
> + * IN THE SOFTWARE.
> + */
> +#pragma once
> +
> +#define SAMPLE_POS_1X(prefix) \
> +prefix##0XOffset = 0.5; \
> +prefix##0YOffset = 0.5;
> +
> +#define SAMPLE_POS_2X(prefix) \
> +prefix##0XOffset = 0.25; \
>
If I were to write the patch, I would probably make it
"prefix##Sample0Offset = 0.25" but this is totally fine and you don't need
to rework it.
> +prefix##0YOffset = 0.25; \
> +prefix##1XOffset = 0.75; \
> +prefix##1YOffset = 0.75;
> +
> +#define SAMPLE_POS_4X(prefix) \
> +prefix##0XOffset = 0.375; \
> +prefix##0YOffset = 0.125; \
> +prefix##1XOffset = 0.875; \
> +prefix##1YOffset = 0.375; \
> +prefix##2XOffset = 0.125; \
> +prefix##2YOffset = 0.625; \
> +prefix##3XOffset = 0.625; \
> +prefix##3YOffset = 0.875;
> +
> +#define SAMPLE_POS_8X(prefix) \
> +prefix##0XOffset = 0.5625; \
> +prefix##0YOffset = 0.3125; \
> +prefix##1XOffset = 0.4375; \
> +prefix##1YOffset = 0.6875; \
> +prefix##2XOffset = 0.8125; \
> +prefix##2YOffset = 0.5625; \
> +prefix##3XOffset = 0.3125; \
> +prefix##3YOffset = 0.1875; \
> +prefix##4XOffset = 0.1875; \
> +prefix##4YOffset = 0.8125; \
> +prefix##5XOffset = 0.0625; \
> +prefix##5YOffset = 0.4375; \
> +prefix##6XOffset = 0.6875; \
> +prefix##6YOffset = 0.9375; \
> +prefix##7XOffset = 0.9375; \
> +prefix##7YOffset = 0.0625;
> +
> +#define SAMPLE_POS_16X(prefix) \
> +prefix##0XOffset = 0.5625; \
> +prefix##0YOffset = 0.5625; \
> +prefix##1XOffset = 0.4375; \
> +prefix##1YOffset = 0.3125; \
> +prefix##2XOffset = 0.3125; \
> +prefix##2YOffset = 0.6250; \
> +prefix##3XOffset = 0.7500; \
> +prefix##3YOffset = 0.4375; \
> +prefix##4XOffset = 0.1875; \
> +prefix##4YOffset = 0.3750; \
> +prefix##5XOffset = 0.6250; \
> +prefix##5YOffset = 0.8125; \
> +prefix##6XOffset = 0.8125; \
> +prefix##6YOffset = 0.6875; \
> +prefix##7XOffset = 0.6875; \
> +prefix##7YOffset = 0.1875; \
> +prefix##8XOffset = 0.3750; \
> +prefix##8YOffset = 0.8750; \
> +prefix##9XOffset = 0.5000; \
> +prefix##9YOffset = 0.0625; \
> +prefix##10XOffset = 0.2500; \
> +prefix##10YOffset = 0.1250; \
> +prefix##11XOffset = 0.1250; \
> +prefix##11YOffset = 0.7500; \
> +prefix##12XOffset = 0.0000; \
> +prefix##12YOffset = 0.5000; \
> +prefix##13XOffset = 0.9375; \
> +prefix##13YOffset = 0.2500; \
> +prefix##14XOffset = 0.8750; \
> +prefix##14YOffset = 0.9375; \
> +prefix##15XOffset = 0.0625; \
> +prefix##15YOffset = 0.0000;
> diff --git a/src/intel/vulkan/genX_pipeline_util.h
> b/src/intel/vulkan/genX_pipeline_util.h
> index 64b89cd..cf2adb0 100644
> --- a/src/intel/vulkan/genX_pipeline_util.h
> +++ b/src/intel/vulkan/genX_pipeline_util.h
> @@ -22,6 +22,7 @@
> */
>
> #include "vk_format_info.h"
> +#include "genX_multisample.h"
>
> static uint32_t
> vertex_element_comp_control(enum isl_format format, unsigned comp)
> @@ -488,42 +489,16 @@ emit_ms_state(struct anv_pipeline *pipeline,
>
> switch (samples) {
> case 1:
> - ms.Sample0XOffset = 0.5;
> - ms.Sample0YOffset = 0.5;
> + SAMPLE_POS_1X(ms.Sample);
> break;
> case 2:
> - ms.Sample0XOffset = 0.25;
> - ms.Sample0YOffset = 0.25;
> - ms.Sample1XOffset = 0.75;
> - ms.Sample1YOffset = 0.75;
> + SAMPLE_POS_2X(ms.Sample);
> break;
> case 4:
> - ms.Sample0XOffset = 0.375;
> - ms.Sample0YOffset = 0.125;
> - ms.Sample1XOffset = 0.875;
> - ms.Sample1YOffset = 0.375;
> - ms.Sample2XOffset = 0.125;
> - ms.Sample2YOffset = 0.625;
> - ms.Sample3XOffset = 0.625;
> - ms.Sample3YOffset = 0.875;
> + SAMPLE_POS_4X(ms.Sample);
> break;
> case 8:
> - ms.Sample0XOffset = 0.5625;
> - ms.Sample0YOffset = 0.3125;
> - ms.Sample1XOffset = 0.4375;
> - ms.Sample1YOffset = 0.6875;
> - ms.Sample2XOffset = 0.8125;
> - ms.Sample2YOffset = 0.5625;
> - ms.Sample3XOffset = 0.3125;
> - ms.Sample3YOffset = 0.1875;
> - ms.Sample4XOffset = 0.1875;
> - ms.Sample4YOffset = 0.8125;
> - ms.Sample5XOffset = 0.0625;
> - ms.Sample5YOffset = 0.4375;
> - ms.Sample6XOffset = 0.6875;
> - ms.Sample6YOffset = 0.9375;
> - ms.Sample7XOffset = 0.9375;
> - ms.Sample7YOffset = 0.0625;
> + SAMPLE_POS_8X(ms.Sample);
> break;
> default:
> break;
> diff --git a/src/intel/vulkan/genX_state.c b/src/intel/vulkan/genX_state.c
> index 8253a8b..2849b50 100644
> --- a/src/intel/vulkan/genX_state.c
> +++ b/src/intel/vulkan/genX_state.c
> @@ -28,6 +28,7 @@
> #include <fcntl.h>
>
> #include "anv_private.h"
> +#include "genX_multisample.h"
>
> #include "genxml/gen_macros.h"
> #include "genxml/genX_pack.h"
> @@ -76,69 +77,12 @@ genX(init_device_state)(struct anv_device *device)
> * VkPhysicalDeviceFeatures::standardSampleLocations.
> */
> anv_batch_emit(&batch, GENX(3DSTATE_SAMPLE_PATTERN), sp) {
> - sp._1xSample0XOffset = 0.5;
> - sp._1xSample0YOffset = 0.5;
> - sp._2xSample0XOffset = 0.25;
> - sp._2xSample0YOffset = 0.25;
> - sp._2xSample1XOffset = 0.75;
> - sp._2xSample1YOffset = 0.75;
> - sp._4xSample0XOffset = 0.375;
> - sp._4xSample0YOffset = 0.125;
> - sp._4xSample1XOffset = 0.875;
> - sp._4xSample1YOffset = 0.375;
> - sp._4xSample2XOffset = 0.125;
> - sp._4xSample2YOffset = 0.625;
> - sp._4xSample3XOffset = 0.625;
> - sp._4xSample3YOffset = 0.875;
> - sp._8xSample0XOffset = 0.5625;
> - sp._8xSample0YOffset = 0.3125;
> - sp._8xSample1XOffset = 0.4375;
> - sp._8xSample1YOffset = 0.6875;
> - sp._8xSample2XOffset = 0.8125;
> - sp._8xSample2YOffset = 0.5625;
> - sp._8xSample3XOffset = 0.3125;
> - sp._8xSample3YOffset = 0.1875;
> - sp._8xSample4XOffset = 0.1875;
> - sp._8xSample4YOffset = 0.8125;
> - sp._8xSample5XOffset = 0.0625;
> - sp._8xSample5YOffset = 0.4375;
> - sp._8xSample6XOffset = 0.6875;
> - sp._8xSample6YOffset = 0.9375;
> - sp._8xSample7XOffset = 0.9375;
> - sp._8xSample7YOffset = 0.0625;
> + SAMPLE_POS_1X(sp._1xSample);
> + SAMPLE_POS_2X(sp._2xSample);
> + SAMPLE_POS_4X(sp._4xSample);
> + SAMPLE_POS_8X(sp._8xSample);
> #if GEN_GEN >= 9
> - sp._16xSample0XOffset = 0.5625;
> - sp._16xSample0YOffset = 0.5625;
> - sp._16xSample1XOffset = 0.4375;
> - sp._16xSample1YOffset = 0.3125;
> - sp._16xSample2XOffset = 0.3125;
> - sp._16xSample2YOffset = 0.6250;
> - sp._16xSample3XOffset = 0.7500;
> - sp._16xSample3YOffset = 0.4375;
> - sp._16xSample4XOffset = 0.1875;
> - sp._16xSample4YOffset = 0.3750;
> - sp._16xSample5XOffset = 0.6250;
> - sp._16xSample5YOffset = 0.8125;
> - sp._16xSample6XOffset = 0.8125;
> - sp._16xSample6YOffset = 0.6875;
> - sp._16xSample7XOffset = 0.6875;
> - sp._16xSample7YOffset = 0.1875;
> - sp._16xSample8XOffset = 0.3750;
> - sp._16xSample8YOffset = 0.8750;
> - sp._16xSample9XOffset = 0.5000;
> - sp._16xSample9YOffset = 0.0625;
> - sp._16xSample10XOffset = 0.2500;
> - sp._16xSample10YOffset = 0.1250;
> - sp._16xSample11XOffset = 0.1250;
> - sp._16xSample11YOffset = 0.7500;
> - sp._16xSample12XOffset = 0.0000;
> - sp._16xSample12YOffset = 0.5000;
> - sp._16xSample13XOffset = 0.9375;
> - sp._16xSample13YOffset = 0.2500;
> - sp._16xSample14XOffset = 0.8750;
> - sp._16xSample14YOffset = 0.9375;
> - sp._16xSample15XOffset = 0.0625;
> - sp._16xSample15YOffset = 0.0000;
> + SAMPLE_POS_16X(sp._16xSample);
> #endif
> }
> #endif
> --
> 2.5.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
