Mesa (vulkan): anv: Unify gen7 and gen8 state
Jason Ekstrand
jekstrand at kemper.freedesktop.org
Tue Mar 1 20:17:36 UTC 2016
Module: Mesa
Branch: vulkan
Commit: 8b091deb5e229dd67c7b9c72d511d3eaa7c9b7d9
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=8b091deb5e229dd67c7b9c72d511d3eaa7c9b7d9
Author: Jason Ekstrand <jason.ekstrand at intel.com>
Date: Tue Mar 1 11:38:11 2016 -0800
anv: Unify gen7 and gen8 state
Now that we've pulled surface state setup into ISL, there's not much to do
here.
---
src/intel/vulkan/Makefile.am | 8 +-
src/intel/vulkan/gen7_state.c | 125 ------------------------
src/intel/vulkan/{gen8_state.c => genX_state.c} | 76 ++++++++++++--
src/intel/vulkan/genX_state_util.h | 65 ------------
4 files changed, 72 insertions(+), 202 deletions(-)
diff --git a/src/intel/vulkan/Makefile.am b/src/intel/vulkan/Makefile.am
index 6be4f9f..7d078cf 100644
--- a/src/intel/vulkan/Makefile.am
+++ b/src/intel/vulkan/Makefile.am
@@ -107,7 +107,7 @@ libanv_gen7_la_SOURCES = \
genX_pipeline.c \
gen7_cmd_buffer.c \
gen7_pipeline.c \
- gen7_state.c
+ genX_state.c
libanv_gen7_la_CFLAGS = $(libvulkan_intel_la_CFLAGS) -DGEN_VERSIONx10=70
libanv_gen75_la_SOURCES = \
@@ -115,7 +115,7 @@ libanv_gen75_la_SOURCES = \
genX_pipeline.c \
gen7_cmd_buffer.c \
gen7_pipeline.c \
- gen7_state.c
+ genX_state.c
libanv_gen75_la_CFLAGS = $(libvulkan_intel_la_CFLAGS) -DGEN_VERSIONx10=75
libanv_gen8_la_SOURCES = \
@@ -123,7 +123,7 @@ libanv_gen8_la_SOURCES = \
genX_pipeline.c \
gen8_cmd_buffer.c \
gen8_pipeline.c \
- gen8_state.c
+ genX_state.c
libanv_gen8_la_CFLAGS = $(libvulkan_intel_la_CFLAGS) -DGEN_VERSIONx10=80
libanv_gen9_la_SOURCES = \
@@ -131,7 +131,7 @@ libanv_gen9_la_SOURCES = \
genX_pipeline.c \
gen8_cmd_buffer.c \
gen8_pipeline.c \
- gen8_state.c
+ genX_state.c
libanv_gen9_la_CFLAGS = $(libvulkan_intel_la_CFLAGS) -DGEN_VERSIONx10=90
if HAVE_EGL_PLATFORM_WAYLAND
diff --git a/src/intel/vulkan/gen7_state.c b/src/intel/vulkan/gen7_state.c
deleted file mode 100644
index 1360697..0000000
--- a/src/intel/vulkan/gen7_state.c
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * Copyright © 2015 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.
- */
-
-#include <assert.h>
-#include <stdbool.h>
-#include <string.h>
-#include <unistd.h>
-#include <fcntl.h>
-
-#include "anv_private.h"
-
-#include "genxml/gen_macros.h"
-#include "genxml/genX_pack.h"
-
-#include "genX_state_util.h"
-
-VkResult
-genX(init_device_state)(struct anv_device *device)
-{
- GENX(MEMORY_OBJECT_CONTROL_STATE_pack)(NULL, &device->default_mocs,
- &GENX(MOCS));
-
- struct anv_batch batch;
-
- uint32_t cmds[64];
- batch.start = batch.next = cmds;
- batch.end = (void *) cmds + sizeof(cmds);
-
- anv_batch_emit(&batch, GENX(PIPELINE_SELECT),
- .PipelineSelection = _3D);
-
- anv_batch_emit(&batch, GENX(3DSTATE_VF_STATISTICS),
- .StatisticsEnable = true);
- anv_batch_emit(&batch, GENX(3DSTATE_HS), .Enable = false);
- anv_batch_emit(&batch, GENX(3DSTATE_TE), .TEEnable = false);
- anv_batch_emit(&batch, GENX(3DSTATE_DS), .DSFunctionEnable = false);
- anv_batch_emit(&batch, GENX(3DSTATE_STREAMOUT), .SOFunctionEnable = false);
- anv_batch_emit(&batch, GENX(3DSTATE_AA_LINE_PARAMETERS));
- anv_batch_emit(&batch, GENX(MI_BATCH_BUFFER_END));
-
- assert(batch.next <= batch.end);
-
- return anv_device_submit_simple_batch(device, &batch);
-}
-
-VkResult genX(CreateSampler)(
- VkDevice _device,
- const VkSamplerCreateInfo* pCreateInfo,
- const VkAllocationCallbacks* pAllocator,
- VkSampler* pSampler)
-{
- ANV_FROM_HANDLE(anv_device, device, _device);
- struct anv_sampler *sampler;
-
- assert(pCreateInfo->sType == VK_STRUCTURE_TYPE_SAMPLER_CREATE_INFO);
-
- sampler = anv_alloc2(&device->alloc, pAllocator, sizeof(*sampler), 8,
- VK_SYSTEM_ALLOCATION_SCOPE_OBJECT);
- if (!sampler)
- return vk_error(VK_ERROR_OUT_OF_HOST_MEMORY);
-
- struct GENX(SAMPLER_STATE) sampler_state = {
- .SamplerDisable = false,
- .TextureBorderColorMode = DX10OGL,
- .LODPreClampEnable = CLAMP_ENABLE_OGL,
- .BaseMipLevel = 0.0,
- .MipModeFilter = vk_to_gen_mipmap_mode[pCreateInfo->mipmapMode],
- .MagModeFilter = vk_to_gen_tex_filter(pCreateInfo->magFilter,
- pCreateInfo->anisotropyEnable),
- .MinModeFilter = vk_to_gen_tex_filter(pCreateInfo->minFilter,
- pCreateInfo->anisotropyEnable),
- .TextureLODBias = pCreateInfo->mipLodBias * 256,
- .AnisotropicAlgorithm = EWAApproximation,
- .MinLOD = pCreateInfo->minLod,
- .MaxLOD = pCreateInfo->maxLod,
- .ChromaKeyEnable = 0,
- .ChromaKeyIndex = 0,
- .ChromaKeyMode = 0,
- .ShadowFunction = vk_to_gen_compare_op[pCreateInfo->compareOp],
- .CubeSurfaceControlMode = OVERRIDE,
-
- .BorderColorPointer =
- device->border_colors.offset +
- pCreateInfo->borderColor * sizeof(float) * 4,
-
- .MaximumAnisotropy = vk_to_gen_max_anisotropy(pCreateInfo->maxAnisotropy),
- .RAddressMinFilterRoundingEnable = 0,
- .RAddressMagFilterRoundingEnable = 0,
- .VAddressMinFilterRoundingEnable = 0,
- .VAddressMagFilterRoundingEnable = 0,
- .UAddressMinFilterRoundingEnable = 0,
- .UAddressMagFilterRoundingEnable = 0,
- .TrilinearFilterQuality = 0,
- .NonnormalizedCoordinateEnable = pCreateInfo->unnormalizedCoordinates,
- .TCXAddressControlMode = vk_to_gen_tex_address[pCreateInfo->addressModeU],
- .TCYAddressControlMode = vk_to_gen_tex_address[pCreateInfo->addressModeV],
- .TCZAddressControlMode = vk_to_gen_tex_address[pCreateInfo->addressModeW],
- };
-
- GENX(SAMPLER_STATE_pack)(NULL, sampler->state, &sampler_state);
-
- *pSampler = anv_sampler_to_handle(sampler);
-
- return VK_SUCCESS;
-}
diff --git a/src/intel/vulkan/gen8_state.c b/src/intel/vulkan/genX_state.c
similarity index 78%
rename from src/intel/vulkan/gen8_state.c
rename to src/intel/vulkan/genX_state.c
index 784269b..866f1bf 100644
--- a/src/intel/vulkan/gen8_state.c
+++ b/src/intel/vulkan/genX_state.c
@@ -32,8 +32,6 @@
#include "genxml/gen_macros.h"
#include "genxml/genX_pack.h"
-#include "genX_state_util.h"
-
VkResult
genX(init_device_state)(struct anv_device *device)
{
@@ -54,13 +52,16 @@ genX(init_device_state)(struct anv_device *device)
anv_batch_emit(&batch, GENX(3DSTATE_VF_STATISTICS),
.StatisticsEnable = true);
- anv_batch_emit(&batch, GENX(3DSTATE_HS), .Enable = false);
- anv_batch_emit(&batch, GENX(3DSTATE_TE), .TEEnable = false);
- anv_batch_emit(&batch, GENX(3DSTATE_DS), .FunctionEnable = false);
+ anv_batch_emit(&batch, GENX(3DSTATE_HS));
+ anv_batch_emit(&batch, GENX(3DSTATE_TE));
+ anv_batch_emit(&batch, GENX(3DSTATE_DS));
+
anv_batch_emit(&batch, GENX(3DSTATE_STREAMOUT), .SOFunctionEnable = false);
+ anv_batch_emit(&batch, GENX(3DSTATE_AA_LINE_PARAMETERS));
+
+#if GEN_GEN >= 8
anv_batch_emit(&batch, GENX(3DSTATE_WM_CHROMAKEY),
.ChromaKeyKillEnable = false);
- anv_batch_emit(&batch, GENX(3DSTATE_AA_LINE_PARAMETERS));
/* See the Vulkan 1.0 spec Table 24.1 "Standard sample locations" and
* VkPhysicalDeviceFeatures::standardSampleLocations.
@@ -131,6 +132,7 @@ genX(init_device_state)(struct anv_device *device)
._16xSample15YOffset = 0.0000,
#endif
);
+#endif
anv_batch_emit(&batch, GENX(MI_BATCH_BUFFER_END));
@@ -139,6 +141,49 @@ genX(init_device_state)(struct anv_device *device)
return anv_device_submit_simple_batch(device, &batch);
}
+static inline uint32_t
+vk_to_gen_tex_filter(VkFilter filter, bool anisotropyEnable)
+{
+ switch (filter) {
+ default:
+ assert(!"Invalid filter");
+ case VK_FILTER_NEAREST:
+ return MAPFILTER_NEAREST;
+ case VK_FILTER_LINEAR:
+ return anisotropyEnable ? MAPFILTER_ANISOTROPIC : MAPFILTER_LINEAR;
+ }
+}
+
+static inline uint32_t
+vk_to_gen_max_anisotropy(float ratio)
+{
+ return (anv_clamp_f(ratio, 2, 16) - 2) / 2;
+}
+
+static const uint32_t vk_to_gen_mipmap_mode[] = {
+ [VK_SAMPLER_MIPMAP_MODE_NEAREST] = MIPFILTER_NEAREST,
+ [VK_SAMPLER_MIPMAP_MODE_LINEAR] = MIPFILTER_LINEAR
+};
+
+static const uint32_t vk_to_gen_tex_address[] = {
+ [VK_SAMPLER_ADDRESS_MODE_REPEAT] = TCM_WRAP,
+ [VK_SAMPLER_ADDRESS_MODE_MIRRORED_REPEAT] = TCM_MIRROR,
+ [VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE] = TCM_CLAMP,
+ [VK_SAMPLER_ADDRESS_MODE_MIRROR_CLAMP_TO_EDGE] = TCM_MIRROR_ONCE,
+ [VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_BORDER] = TCM_CLAMP_BORDER,
+};
+
+static const uint32_t vk_to_gen_compare_op[] = {
+ [VK_COMPARE_OP_NEVER] = PREFILTEROPNEVER,
+ [VK_COMPARE_OP_LESS] = PREFILTEROPLESS,
+ [VK_COMPARE_OP_EQUAL] = PREFILTEROPEQUAL,
+ [VK_COMPARE_OP_LESS_OR_EQUAL] = PREFILTEROPLEQUAL,
+ [VK_COMPARE_OP_GREATER] = PREFILTEROPGREATER,
+ [VK_COMPARE_OP_NOT_EQUAL] = PREFILTEROPNOTEQUAL,
+ [VK_COMPARE_OP_GREATER_OR_EQUAL] = PREFILTEROPGEQUAL,
+ [VK_COMPARE_OP_ALWAYS] = PREFILTEROPALWAYS,
+};
+
VkResult genX(CreateSampler)(
VkDevice _device,
const VkSamplerCreateInfo* pCreateInfo,
@@ -161,13 +206,21 @@ VkResult genX(CreateSampler)(
struct GENX(SAMPLER_STATE) sampler_state = {
.SamplerDisable = false,
.TextureBorderColorMode = DX10OGL,
+
+#if GEN_GEN >= 8
.LODPreClampMode = CLAMP_MODE_OGL,
+#else
+ .LODPreClampEnable = CLAMP_ENABLE_OGL,
+#endif
+
#if GEN_GEN == 8
.BaseMipLevel = 0.0,
#endif
.MipModeFilter = vk_to_gen_mipmap_mode[pCreateInfo->mipmapMode],
- .MagModeFilter = vk_to_gen_tex_filter(pCreateInfo->magFilter, pCreateInfo->anisotropyEnable),
- .MinModeFilter = vk_to_gen_tex_filter(pCreateInfo->minFilter, pCreateInfo->anisotropyEnable),
+ .MagModeFilter = vk_to_gen_tex_filter(pCreateInfo->magFilter,
+ pCreateInfo->anisotropyEnable),
+ .MinModeFilter = vk_to_gen_tex_filter(pCreateInfo->minFilter,
+ pCreateInfo->anisotropyEnable),
.TextureLODBias = anv_clamp_f(pCreateInfo->mipLodBias, -16, 15.996),
.AnisotropicAlgorithm = EWAApproximation,
.MinLOD = anv_clamp_f(pCreateInfo->minLod, 0, 14),
@@ -178,9 +231,16 @@ VkResult genX(CreateSampler)(
.ShadowFunction = vk_to_gen_compare_op[pCreateInfo->compareOp],
.CubeSurfaceControlMode = OVERRIDE,
+#if GEN_GEN >= 8
.IndirectStatePointer = border_color_offset >> 6,
+#else
+ .BorderColorPointer = border_color_offset >> 5,
+#endif
+#if GEN_GEN >= 8
.LODClampMagnificationMode = MIPNONE,
+#endif
+
.MaximumAnisotropy = vk_to_gen_max_anisotropy(pCreateInfo->maxAnisotropy),
.RAddressMinFilterRoundingEnable = 0,
.RAddressMagFilterRoundingEnable = 0,
diff --git a/src/intel/vulkan/genX_state_util.h b/src/intel/vulkan/genX_state_util.h
deleted file mode 100644
index aabcea9..0000000
--- a/src/intel/vulkan/genX_state_util.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright © 2015 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.
- */
-
-static inline uint32_t
-vk_to_gen_tex_filter(VkFilter filter, bool anisotropyEnable)
-{
- switch (filter) {
- default:
- assert(!"Invalid filter");
- case VK_FILTER_NEAREST:
- return MAPFILTER_NEAREST;
- case VK_FILTER_LINEAR:
- return anisotropyEnable ? MAPFILTER_ANISOTROPIC : MAPFILTER_LINEAR;
- }
-}
-
-static inline uint32_t
-vk_to_gen_max_anisotropy(float ratio)
-{
- return (anv_clamp_f(ratio, 2, 16) - 2) / 2;
-}
-
-static const uint32_t vk_to_gen_mipmap_mode[] = {
- [VK_SAMPLER_MIPMAP_MODE_NEAREST] = MIPFILTER_NEAREST,
- [VK_SAMPLER_MIPMAP_MODE_LINEAR] = MIPFILTER_LINEAR
-};
-
-static const uint32_t vk_to_gen_tex_address[] = {
- [VK_SAMPLER_ADDRESS_MODE_REPEAT] = TCM_WRAP,
- [VK_SAMPLER_ADDRESS_MODE_MIRRORED_REPEAT] = TCM_MIRROR,
- [VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE] = TCM_CLAMP,
- [VK_SAMPLER_ADDRESS_MODE_MIRROR_CLAMP_TO_EDGE] = TCM_MIRROR_ONCE,
- [VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_BORDER] = TCM_CLAMP_BORDER,
-};
-
-static const uint32_t vk_to_gen_compare_op[] = {
- [VK_COMPARE_OP_NEVER] = PREFILTEROPNEVER,
- [VK_COMPARE_OP_LESS] = PREFILTEROPLESS,
- [VK_COMPARE_OP_EQUAL] = PREFILTEROPEQUAL,
- [VK_COMPARE_OP_LESS_OR_EQUAL] = PREFILTEROPLEQUAL,
- [VK_COMPARE_OP_GREATER] = PREFILTEROPGREATER,
- [VK_COMPARE_OP_NOT_EQUAL] = PREFILTEROPNOTEQUAL,
- [VK_COMPARE_OP_GREATER_OR_EQUAL] = PREFILTEROPGEQUAL,
- [VK_COMPARE_OP_ALWAYS] = PREFILTEROPALWAYS,
-};
More information about the mesa-commit
mailing list