Compare commits
2 Commits
master
...
parse-patc
Author | SHA1 | Date |
---|---|---|
Hans-Kristian Arntzen | 0fb545bd8f | |
Hans-Kristian Arntzen | c871efd4df |
|
@ -231,16 +231,19 @@ static inline bool is_power_of_two(unsigned int x)
|
|||
return x && !(x & (x -1));
|
||||
}
|
||||
|
||||
static inline void vkd3d_parse_version(const char *version, int *major, int *minor)
|
||||
static inline void vkd3d_parse_version(const char *version, int *major, int *minor, int *patch)
|
||||
{
|
||||
*major = atoi(version);
|
||||
char *end;
|
||||
|
||||
while (isdigit(*version))
|
||||
++version;
|
||||
*major = strtol(version, &end, 10);
|
||||
version = end;
|
||||
if (*version == '.')
|
||||
++version;
|
||||
|
||||
*minor = atoi(version);
|
||||
*minor = strtol(version, &end, 10);
|
||||
version = end;
|
||||
if (*version == '.')
|
||||
++version;
|
||||
*patch = strtol(version, NULL, 10);
|
||||
}
|
||||
|
||||
static inline uint32_t float_bits_to_uint32(float f)
|
||||
|
|
|
@ -48,11 +48,11 @@ static const void *vkd3d_find_struct_(const struct vkd3d_struct *chain,
|
|||
|
||||
static uint32_t vkd3d_get_vk_version(void)
|
||||
{
|
||||
int major, minor;
|
||||
int major, minor, patch;
|
||||
|
||||
vkd3d_parse_version(PACKAGE_VERSION, &major, &minor);
|
||||
INFO("vkd3d-proton - applicationVersion: %d.%d.0.\n", major, minor);
|
||||
return VK_MAKE_VERSION(major, minor, 0);
|
||||
vkd3d_parse_version(PACKAGE_VERSION, &major, &minor, &patch);
|
||||
INFO("vkd3d-proton - applicationVersion: %d.%d.%d.\n", major, minor, patch);
|
||||
return VK_MAKE_VERSION(major, minor, patch);
|
||||
}
|
||||
|
||||
struct vkd3d_optional_extension_info
|
||||
|
|
|
@ -4573,7 +4573,7 @@ static void vkd3d_create_texture_uav(struct d3d12_desc *descriptor,
|
|||
key.u.texture.view_type = VK_IMAGE_VIEW_TYPE_3D;
|
||||
key.u.texture.miplevel_idx = desc->Texture3D.MipSlice;
|
||||
if (desc->Texture3D.FirstWSlice ||
|
||||
((desc->Texture3D.WSize != max(1u, resource->desc.DepthOrArraySize >> desc->Texture3D.MipSlice)) &&
|
||||
((desc->Texture3D.WSize != max(1u, (UINT)resource->desc.DepthOrArraySize >> desc->Texture3D.MipSlice)) &&
|
||||
(desc->Texture3D.WSize != UINT_MAX)))
|
||||
{
|
||||
FIXME("Unhandled depth view %u-%u.\n",
|
||||
|
|
Loading…
Reference in New Issue