Fix formatting, update C ABI version.

There are some issues with clang-format which require auto-formatting to
be disabled for this file.
This commit is contained in:
Hans-Kristian Arntzen 2019-05-18 10:47:02 +02:00
Родитель e04bbd0948
Коммит 09c01c2d45
3 изменённых файлов: 11 добавлений и 10 удалений

Просмотреть файл

@ -265,10 +265,11 @@ if (SPIRV_CROSS_STATIC)
endif() endif()
endif() endif()
set(spirv-cross-abi-major 0)
set(spirv-cross-abi-minor 9)
set(spirv-cross-abi-patch 0)
if (SPIRV_CROSS_SHARED) if (SPIRV_CROSS_SHARED)
set(spirv-cross-abi-major 0)
set(spirv-cross-abi-minor 8)
set(spirv-cross-abi-patch 0)
set(SPIRV_CROSS_VERSION ${spirv-cross-abi-major}.${spirv-cross-abi-minor}.${spirv-cross-abi-patch}) set(SPIRV_CROSS_VERSION ${spirv-cross-abi-major}.${spirv-cross-abi-minor}.${spirv-cross-abi-patch})
set(SPIRV_CROSS_INSTALL_LIB_DIR ${CMAKE_INSTALL_PREFIX}/lib) set(SPIRV_CROSS_INSTALL_LIB_DIR ${CMAKE_INSTALL_PREFIX}/lib)
set(SPIRV_CROSS_INSTALL_INC_DIR ${CMAKE_INSTALL_PREFIX}/include/spirv_cross) set(SPIRV_CROSS_INSTALL_INC_DIR ${CMAKE_INSTALL_PREFIX}/include/spirv_cross)

Просмотреть файл

@ -1654,9 +1654,9 @@ spvc_constant_id spvc_compiler_get_work_group_size_specialization_constants(spvc
} }
spvc_result spvc_compiler_get_active_buffer_ranges(spvc_compiler compiler, spvc_result spvc_compiler_get_active_buffer_ranges(spvc_compiler compiler,
spvc_variable_id id, spvc_variable_id id,
const spvc_buffer_range **ranges, const spvc_buffer_range **ranges,
size_t *num_ranges) size_t *num_ranges)
{ {
SPVC_BEGIN_SAFE_SCOPE SPVC_BEGIN_SAFE_SCOPE
{ {

Просмотреть файл

@ -33,7 +33,7 @@ extern "C" {
/* Bumped if ABI or API breaks backwards compatibility. */ /* Bumped if ABI or API breaks backwards compatibility. */
#define SPVC_C_API_VERSION_MAJOR 0 #define SPVC_C_API_VERSION_MAJOR 0
/* Bumped if APIs or enumerations are added in a backwards compatible way. */ /* Bumped if APIs or enumerations are added in a backwards compatible way. */
#define SPVC_C_API_VERSION_MINOR 8 #define SPVC_C_API_VERSION_MINOR 9
/* Bumped if internal implementation details change. */ /* Bumped if internal implementation details change. */
#define SPVC_C_API_VERSION_PATCH 0 #define SPVC_C_API_VERSION_PATCH 0
@ -684,9 +684,9 @@ SPVC_PUBLIC_API spvc_constant_id spvc_compiler_get_work_group_size_specializatio
* Maps to C++ API. * Maps to C++ API.
*/ */
SPVC_PUBLIC_API spvc_result spvc_compiler_get_active_buffer_ranges(spvc_compiler compiler, SPVC_PUBLIC_API spvc_result spvc_compiler_get_active_buffer_ranges(spvc_compiler compiler,
spvc_variable_id id, spvc_variable_id id,
const spvc_buffer_range **ranges, const spvc_buffer_range **ranges,
size_t *num_ranges); size_t *num_ranges);
/* /*
* No stdint.h until C99, sigh :( * No stdint.h until C99, sigh :(