wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2024-11-21 16:46:41 -08:00
Code Issues Packages Projects Releases Wiki Activity

include: Introduce a common macro for defining tags.

Browse Source 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Henri Verbeet 2022-03-01 13:21:32 +01:00 committed by Alexandre Julliard
parent 273316a742
commit 4728cf1286
5 changed files with 28 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/private/vkd3d_common.h
View File

@ -42,6 +42,10 @@
#define MEMBER_SIZE(t, m) sizeof(((t *)0)->m) #define MEMBER_SIZE(t, m) sizeof(((t *)0)->m)
#define VKD3D_MAKE_TAG(ch0, ch1, ch2, ch3) \
((uint32_t)(ch0) | ((uint32_t)(ch1) << 8) \
| ((uint32_t)(ch2) << 16) | ((uint32_t)(ch3) << 24))
static inline size_t align(size_t addr, size_t alignment) static inline size_t align(size_t addr, size_t alignment)
{ {
return (addr + (alignment - 1)) & ~(alignment - 1); return (addr + (alignment - 1)) & ~(alignment - 1);

2
libs/vkd3d-shader/hlsl_sm1.c
View File

@ -335,7 +335,7 @@ static void write_sm1_uniforms(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffe
sm1_sort_externs(ctx); sm1_sort_externs(ctx);
size_offset = put_u32(buffer, 0); size_offset = put_u32(buffer, 0);
ctab_offset = put_u32(buffer, MAKEFOURCC('C','T','A','B')); ctab_offset = put_u32(buffer, VKD3D_MAKE_TAG('C','T','A','B'));
ctab_start = put_u32(buffer, sizeof(D3DXSHADER_CONSTANTTABLE)); ctab_start = put_u32(buffer, sizeof(D3DXSHADER_CONSTANTTABLE));
creator_offset = put_u32(buffer, 0); creator_offset = put_u32(buffer, 0);

35
libs/vkd3d-shader/vkd3d_shader_private.h
View File

@ -1232,25 +1232,22 @@ static inline void *vkd3d_find_struct_(const struct vkd3d_struct *chain,
#define VKD3D_DXBC_MAX_SOURCE_COUNT 6 #define VKD3D_DXBC_MAX_SOURCE_COUNT 6
#define VKD3D_DXBC_HEADER_SIZE (8 * sizeof(uint32_t)) #define VKD3D_DXBC_HEADER_SIZE (8 * sizeof(uint32_t))
#define MAKE_TAG(ch0, ch1, ch2, ch3) \ #define TAG_AON9 VKD3D_MAKE_TAG('A', 'o', 'n', '9')
((DWORD)(ch0) | ((DWORD)(ch1) << 8) | \ #define TAG_DXBC VKD3D_MAKE_TAG('D', 'X', 'B', 'C')
((DWORD)(ch2) << 16) | ((DWORD)(ch3) << 24 )) #define TAG_DXIL VKD3D_MAKE_TAG('D', 'X', 'I', 'L')
#define TAG_AON9 MAKE_TAG('A', 'o', 'n', '9') #define TAG_ISG1 VKD3D_MAKE_TAG('I', 'S', 'G', '1')
#define TAG_DXBC MAKE_TAG('D', 'X', 'B', 'C') #define TAG_ISGN VKD3D_MAKE_TAG('I', 'S', 'G', 'N')
#define TAG_DXIL MAKE_TAG('D', 'X', 'I', 'L') #define TAG_OSG1 VKD3D_MAKE_TAG('O', 'S', 'G', '1')
#define TAG_ISG1 MAKE_TAG('I', 'S', 'G', '1') #define TAG_OSG5 VKD3D_MAKE_TAG('O', 'S', 'G', '5')
#define TAG_ISGN MAKE_TAG('I', 'S', 'G', 'N') #define TAG_OSGN VKD3D_MAKE_TAG('O', 'S', 'G', 'N')
#define TAG_OSG1 MAKE_TAG('O', 'S', 'G', '1') #define TAG_PCSG VKD3D_MAKE_TAG('P', 'C', 'S', 'G')
#define TAG_OSG5 MAKE_TAG('O', 'S', 'G', '5') #define TAG_PSG1 VKD3D_MAKE_TAG('P', 'S', 'G', '1')
#define TAG_OSGN MAKE_TAG('O', 'S', 'G', 'N') #define TAG_RD11 VKD3D_MAKE_TAG('R', 'D', '1', '1')
#define TAG_PCSG MAKE_TAG('P', 'C', 'S', 'G') #define TAG_RDEF VKD3D_MAKE_TAG('R', 'D', 'E', 'F')
#define TAG_PSG1 MAKE_TAG('P', 'S', 'G', '1') #define TAG_RTS0 VKD3D_MAKE_TAG('R', 'T', 'S', '0')
#define TAG_RD11 MAKE_TAG('R', 'D', '1', '1') #define TAG_SHDR VKD3D_MAKE_TAG('S', 'H', 'D', 'R')
#define TAG_RDEF MAKE_TAG('R', 'D', 'E', 'F') #define TAG_SHEX VKD3D_MAKE_TAG('S', 'H', 'E', 'X')
#define TAG_RTS0 MAKE_TAG('R', 'T', 'S', '0') #define TAG_TEXT VKD3D_MAKE_TAG('T', 'E', 'X', 'T')
#define TAG_SHDR MAKE_TAG('S', 'H', 'D', 'R')
#define TAG_SHEX MAKE_TAG('S', 'H', 'E', 'X')
#define TAG_TEXT MAKE_TAG('T', 'E', 'X', 'T')
struct dxbc_writer_section struct dxbc_writer_section
{ {

14
libs/vkd3d/vkd3d_private.h
View File

@ -44,17 +44,15 @@
#define VK_CALL(f) (vk_procs->f) #define VK_CALL(f) (vk_procs->f)
#define MAKE_MAGIC(a,b,c,f) (((uint32_t)a) | (((uint32_t)b) << 8) | (((uint32_t)c) << 16) | f)
#define VKD3D_DESCRIPTOR_MAGIC_HAS_VIEW 0x01000000u #define VKD3D_DESCRIPTOR_MAGIC_HAS_VIEW 0x01000000u
#define VKD3D_DESCRIPTOR_MAGIC_FREE 0x00000000u #define VKD3D_DESCRIPTOR_MAGIC_FREE 0x00000000u
#define VKD3D_DESCRIPTOR_MAGIC_CBV MAKE_MAGIC('C', 'B', 'V', 0) #define VKD3D_DESCRIPTOR_MAGIC_CBV VKD3D_MAKE_TAG('C', 'B', 'V', 0)
#define VKD3D_DESCRIPTOR_MAGIC_SRV MAKE_MAGIC('S', 'R', 'V', VKD3D_DESCRIPTOR_MAGIC_HAS_VIEW) #define VKD3D_DESCRIPTOR_MAGIC_SRV VKD3D_MAKE_TAG('S', 'R', 'V', 1)
#define VKD3D_DESCRIPTOR_MAGIC_UAV MAKE_MAGIC('U', 'A', 'V', VKD3D_DESCRIPTOR_MAGIC_HAS_VIEW) #define VKD3D_DESCRIPTOR_MAGIC_UAV VKD3D_MAKE_TAG('U', 'A', 'V', 1)
#define VKD3D_DESCRIPTOR_MAGIC_SAMPLER MAKE_MAGIC('S', 'M', 'P', VKD3D_DESCRIPTOR_MAGIC_HAS_VIEW) #define VKD3D_DESCRIPTOR_MAGIC_SAMPLER VKD3D_MAKE_TAG('S', 'M', 'P', 1)
#define VKD3D_DESCRIPTOR_MAGIC_DSV MAKE_MAGIC('D', 'S', 'V', 0) #define VKD3D_DESCRIPTOR_MAGIC_DSV VKD3D_MAKE_TAG('D', 'S', 'V', 0)
#define VKD3D_DESCRIPTOR_MAGIC_RTV MAKE_MAGIC('R', 'T', 'V', 0) #define VKD3D_DESCRIPTOR_MAGIC_RTV VKD3D_MAKE_TAG('R', 'T', 'V', 0)
#define VKD3D_MAX_COMPATIBLE_FORMAT_COUNT 6u #define VKD3D_MAX_COMPATIBLE_FORMAT_COUNT 6u
#define VKD3D_MAX_QUEUE_FAMILY_COUNT 3u #define VKD3D_MAX_QUEUE_FAMILY_COUNT 3u

5
programs/vkd3d-compiler/main.c
View File

@ -50,10 +50,7 @@ enum
OPTION_TEXT_FORMATTING, OPTION_TEXT_FORMATTING,
}; };
#define MAKE_TAG(ch0, ch1, ch2, ch3) \ #define TAG_DXBC VKD3D_MAKE_TAG('D', 'X', 'B', 'C')
((DWORD)(ch0) | ((DWORD)(ch1) << 8) | \
((DWORD)(ch2) << 16) | ((DWORD)(ch3) << 24 ))
#define TAG_DXBC MAKE_TAG('D', 'X', 'B', 'C')
static const struct source_type_info static const struct source_type_info
{ {