fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-28 16:50:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

genX/state: Pull some generic helpers into a shared header

Browse source
This commit is contained in:
Jason Ekstrand 2015-12-31 13:51:15 -08:00
parent ad9ff4f2b2
commit 5f5fc23e7c
3 changed files with 69 additions and 84 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
src/vulkan/gen7_state.c
View file

@ -32,30 +32,7 @@
#include "gen7_pack.h"
#include "gen75_pack.h"
static const uint8_t
anv_surftype(const struct anv_image *image, VkImageViewType view_type,
bool storage)
{
switch (view_type) {
default:
unreachable("bad VkImageViewType");
case VK_IMAGE_VIEW_TYPE_1D:
case VK_IMAGE_VIEW_TYPE_1D_ARRAY:
assert(image->type == VK_IMAGE_TYPE_1D);
return SURFTYPE_1D;
case VK_IMAGE_VIEW_TYPE_CUBE:
case VK_IMAGE_VIEW_TYPE_CUBE_ARRAY:
assert(image->type == VK_IMAGE_TYPE_2D);
return storage ? SURFTYPE_2D : SURFTYPE_CUBE;
case VK_IMAGE_VIEW_TYPE_2D:
case VK_IMAGE_VIEW_TYPE_2D_ARRAY:
assert(image->type == VK_IMAGE_TYPE_2D);
return SURFTYPE_2D;
case VK_IMAGE_VIEW_TYPE_3D:
assert(image->type == VK_IMAGE_TYPE_3D);
return SURFTYPE_3D;
}
}
#include "genX_state_util.h"
GENX_FUNC(GEN7, GEN75) void
genX(fill_buffer_surface_state)(void *state, enum isl_format format,
@ -208,24 +185,6 @@ static const uint8_t anv_valign[] = {
[4] = VALIGN_4,
};
static const uint32_t vk_to_gen_swizzle_map[] = {
[VK_COMPONENT_SWIZZLE_ZERO] = SCS_ZERO,
[VK_COMPONENT_SWIZZLE_ONE] = SCS_ONE,
[VK_COMPONENT_SWIZZLE_R] = SCS_RED,
[VK_COMPONENT_SWIZZLE_G] = SCS_GREEN,
[VK_COMPONENT_SWIZZLE_B] = SCS_BLUE,
[VK_COMPONENT_SWIZZLE_A] = SCS_ALPHA
};
static inline uint32_t
vk_to_gen_swizzle(VkComponentSwizzle swizzle, VkComponentSwizzle component)
{
if (swizzle == VK_COMPONENT_SWIZZLE_IDENTITY)
return vk_to_gen_swizzle_map[component];
else
return vk_to_gen_swizzle_map[swizzle];
}
GENX_FUNC(GEN7, GEN75) void
genX(image_view_init)(struct anv_image_view *iview,
struct anv_device *device,

43
src/vulkan/gen8_state.c
View file

@ -32,30 +32,7 @@
#include "gen8_pack.h"
#include "gen9_pack.h"
static const uint8_t
anv_surftype(const struct anv_image *image, VkImageViewType view_type,
bool storage)
{
switch (view_type) {
default:
unreachable("bad VkImageViewType");
case VK_IMAGE_VIEW_TYPE_1D:
case VK_IMAGE_VIEW_TYPE_1D_ARRAY:
assert(image->type == VK_IMAGE_TYPE_1D);
return SURFTYPE_1D;
case VK_IMAGE_VIEW_TYPE_CUBE:
case VK_IMAGE_VIEW_TYPE_CUBE_ARRAY:
assert(image->type == VK_IMAGE_TYPE_2D);
return storage ? SURFTYPE_2D : SURFTYPE_CUBE;
case VK_IMAGE_VIEW_TYPE_2D:
case VK_IMAGE_VIEW_TYPE_2D_ARRAY:
assert(image->type == VK_IMAGE_TYPE_2D);
return SURFTYPE_2D;
case VK_IMAGE_VIEW_TYPE_3D:
assert(image->type == VK_IMAGE_TYPE_3D);
return SURFTYPE_3D;
}
}
#include "genX_state_util.h"
void
genX(fill_buffer_surface_state)(void *state, enum isl_format format,
@ -112,24 +89,6 @@ alloc_surface_state(struct anv_device *device,
}
}
static const uint32_t vk_to_gen_swizzle_map[] = {
[VK_COMPONENT_SWIZZLE_ZERO] = SCS_ZERO,
[VK_COMPONENT_SWIZZLE_ONE] = SCS_ONE,
[VK_COMPONENT_SWIZZLE_R] = SCS_RED,
[VK_COMPONENT_SWIZZLE_G] = SCS_GREEN,
[VK_COMPONENT_SWIZZLE_B] = SCS_BLUE,
[VK_COMPONENT_SWIZZLE_A] = SCS_ALPHA
};
static inline uint32_t
vk_to_gen_swizzle(VkComponentSwizzle swizzle, VkComponentSwizzle component)
{
if (swizzle == VK_COMPONENT_SWIZZLE_IDENTITY)
return vk_to_gen_swizzle_map[component];
else
return vk_to_gen_swizzle_map[swizzle];
}
/**
* Get the values to pack into RENDER_SUFFACE_STATE.SurfaceHorizontalAlignment
* and SurfaceVerticalAlignment.

67
src/vulkan/genX_state_util.h Normal file
View file

@ -0,0 +1,67 @@
/*
* 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 const uint8_t
anv_surftype(const struct anv_image *image, VkImageViewType view_type,
bool storage)
{
switch (view_type) {
default:
unreachable("bad VkImageViewType");
case VK_IMAGE_VIEW_TYPE_1D:
case VK_IMAGE_VIEW_TYPE_1D_ARRAY:
assert(image->type == VK_IMAGE_TYPE_1D);
return SURFTYPE_1D;
case VK_IMAGE_VIEW_TYPE_CUBE:
case VK_IMAGE_VIEW_TYPE_CUBE_ARRAY:
assert(image->type == VK_IMAGE_TYPE_2D);
return storage ? SURFTYPE_2D : SURFTYPE_CUBE;
case VK_IMAGE_VIEW_TYPE_2D:
case VK_IMAGE_VIEW_TYPE_2D_ARRAY:
assert(image->type == VK_IMAGE_TYPE_2D);
return SURFTYPE_2D;
case VK_IMAGE_VIEW_TYPE_3D:
assert(image->type == VK_IMAGE_TYPE_3D);
return SURFTYPE_3D;
}
}
#if ANV_GEN > 7 || ANV_IS_HASWELL
static const uint32_t vk_to_gen_swizzle_map[] = {
[VK_COMPONENT_SWIZZLE_ZERO] = SCS_ZERO,
[VK_COMPONENT_SWIZZLE_ONE] = SCS_ONE,
[VK_COMPONENT_SWIZZLE_R] = SCS_RED,
[VK_COMPONENT_SWIZZLE_G] = SCS_GREEN,
[VK_COMPONENT_SWIZZLE_B] = SCS_BLUE,
[VK_COMPONENT_SWIZZLE_A] = SCS_ALPHA
};
static inline uint32_t
vk_to_gen_swizzle(VkComponentSwizzle swizzle, VkComponentSwizzle component)
{
if (swizzle == VK_COMPONENT_SWIZZLE_IDENTITY)
return vk_to_gen_swizzle_map[component];
else
return vk_to_gen_swizzle_map[swizzle];
}
#endif