Skip to content

Commit

Permalink
Fix formatting, update C ABI version.
Browse files Browse the repository at this point in the history
There are some issues with clang-format which require auto-formatting to
be disabled for this file.
  • Loading branch information
HansKristian-Work committed May 18, 2019
1 parent e04bbd0 commit 09c01c2
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 10 deletions.
7 changes: 4 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -265,10 +265,11 @@ if (SPIRV_CROSS_STATIC)
endif()
endif()

set(spirv-cross-abi-major 0)
set(spirv-cross-abi-minor 9)
set(spirv-cross-abi-patch 0)

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_INSTALL_LIB_DIR ${CMAKE_INSTALL_PREFIX}/lib)
set(SPIRV_CROSS_INSTALL_INC_DIR ${CMAKE_INSTALL_PREFIX}/include/spirv_cross)
Expand Down
6 changes: 3 additions & 3 deletions spirv_cross_c.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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_variable_id id,
const spvc_buffer_range **ranges,
size_t *num_ranges)
spvc_variable_id id,
const spvc_buffer_range **ranges,
size_t *num_ranges)
{
SPVC_BEGIN_SAFE_SCOPE
{
Expand Down
8 changes: 4 additions & 4 deletions spirv_cross_c.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ extern "C" {
/* Bumped if ABI or API breaks backwards compatibility. */
#define SPVC_C_API_VERSION_MAJOR 0
/* 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. */
#define SPVC_C_API_VERSION_PATCH 0

Expand Down Expand Up @@ -684,9 +684,9 @@ SPVC_PUBLIC_API spvc_constant_id spvc_compiler_get_work_group_size_specializatio
* Maps to C++ API.
*/
SPVC_PUBLIC_API spvc_result spvc_compiler_get_active_buffer_ranges(spvc_compiler compiler,
spvc_variable_id id,
const spvc_buffer_range **ranges,
size_t *num_ranges);
spvc_variable_id id,
const spvc_buffer_range **ranges,
size_t *num_ranges);

/*
* No stdint.h until C99, sigh :(
Expand Down

0 comments on commit 09c01c2

Please sign in to comment.