summaryrefslogtreecommitdiffstats
path: root/src/intel/vulkan
diff options
context:
space:
mode:
Diffstat (limited to 'src/intel/vulkan')
-rw-r--r--src/intel/vulkan/genX_blorp_exec.c10
-rw-r--r--src/intel/vulkan/genX_multisample.h95
-rw-r--r--src/intel/vulkan/genX_pipeline_util.h10
-rw-r--r--src/intel/vulkan/genX_state.c12
4 files changed, 16 insertions, 111 deletions
diff --git a/src/intel/vulkan/genX_blorp_exec.c b/src/intel/vulkan/genX_blorp_exec.c
index 889c423b424..5a08ed36243 100644
--- a/src/intel/vulkan/genX_blorp_exec.c
+++ b/src/intel/vulkan/genX_blorp_exec.c
@@ -24,7 +24,6 @@
#include <assert.h>
#include "anv_private.h"
-#include "genX_multisample.h"
/* These are defined in anv_private.h and blorp_genX_exec.h */
#undef __gen_address_type
@@ -32,6 +31,7 @@
#undef __gen_combine_address
#include "common/gen_l3_config.h"
+#include "common/gen_sample_positions.h"
#include "blorp/blorp_genX_exec.h"
static void *
@@ -164,16 +164,16 @@ blorp_emit_3dstate_multisample(struct blorp_batch *batch, unsigned samples)
switch (samples) {
case 1:
- SAMPLE_POS_1X(ms.Sample);
+ GEN_SAMPLE_POS_1X(ms.Sample);
break;
case 2:
- SAMPLE_POS_2X(ms.Sample);
+ GEN_SAMPLE_POS_2X(ms.Sample);
break;
case 4:
- SAMPLE_POS_4X(ms.Sample);
+ GEN_SAMPLE_POS_4X(ms.Sample);
break;
case 8:
- SAMPLE_POS_8X(ms.Sample);
+ GEN_SAMPLE_POS_8X(ms.Sample);
break;
default:
break;
diff --git a/src/intel/vulkan/genX_multisample.h b/src/intel/vulkan/genX_multisample.h
deleted file mode 100644
index 0deb48fba8a..00000000000
--- a/src/intel/vulkan/genX_multisample.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * 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; \
-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 2c0bf3f192a..0ff92f16ef8 100644
--- a/src/intel/vulkan/genX_pipeline_util.h
+++ b/src/intel/vulkan/genX_pipeline_util.h
@@ -22,8 +22,8 @@
*/
#include "common/gen_l3_config.h"
+#include "common/gen_sample_positions.h"
#include "vk_format_info.h"
-#include "genX_multisample.h"
static uint32_t
vertex_element_comp_control(enum isl_format format, unsigned comp)
@@ -610,16 +610,16 @@ emit_ms_state(struct anv_pipeline *pipeline,
switch (samples) {
case 1:
- SAMPLE_POS_1X(ms.Sample);
+ GEN_SAMPLE_POS_1X(ms.Sample);
break;
case 2:
- SAMPLE_POS_2X(ms.Sample);
+ GEN_SAMPLE_POS_2X(ms.Sample);
break;
case 4:
- SAMPLE_POS_4X(ms.Sample);
+ GEN_SAMPLE_POS_4X(ms.Sample);
break;
case 8:
- SAMPLE_POS_8X(ms.Sample);
+ GEN_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 2849b50ea37..a6d405dac5d 100644
--- a/src/intel/vulkan/genX_state.c
+++ b/src/intel/vulkan/genX_state.c
@@ -28,8 +28,8 @@
#include <fcntl.h>
#include "anv_private.h"
-#include "genX_multisample.h"
+#include "common/gen_sample_positions.h"
#include "genxml/gen_macros.h"
#include "genxml/genX_pack.h"
@@ -77,12 +77,12 @@ genX(init_device_state)(struct anv_device *device)
* VkPhysicalDeviceFeatures::standardSampleLocations.
*/
anv_batch_emit(&batch, GENX(3DSTATE_SAMPLE_PATTERN), sp) {
- SAMPLE_POS_1X(sp._1xSample);
- SAMPLE_POS_2X(sp._2xSample);
- SAMPLE_POS_4X(sp._4xSample);
- SAMPLE_POS_8X(sp._8xSample);
+ GEN_SAMPLE_POS_1X(sp._1xSample);
+ GEN_SAMPLE_POS_2X(sp._2xSample);
+ GEN_SAMPLE_POS_4X(sp._4xSample);
+ GEN_SAMPLE_POS_8X(sp._8xSample);
#if GEN_GEN >= 9
- SAMPLE_POS_16X(sp._16xSample);
+ GEN_SAMPLE_POS_16X(sp._16xSample);
#endif
}
#endif
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-12 10:47:15 +0000