xenia-project/SPIRV-Tools
1
0
Fork 0
mirror of https://github.com/xenia-project/SPIRV-Tools.git synced 2024-11-27 21:20:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Hide spvBinaryHeaderSet with its only client.

Browse Source 
Also rename it to SetHeader since it's not part of the "binary"
API.
This commit is contained in:
David Neto 2015-10-27 15:51:34 -04:00
parent fcc7d58353
commit 0b9816813b
3 changed files with 20 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
source/binary.cpp
View File

@ -113,19 +113,6 @@ spv_result_t spvBinaryHeaderGet(const spv_binary binary,
return SPV_SUCCESS;
}
spv_result_t spvBinaryHeaderSet(spv_binary_t *binary, const uint32_t bound) {
if (!binary) return SPV_ERROR_INVALID_BINARY;
if (!binary->code || !binary->wordCount) return SPV_ERROR_INVALID_BINARY;
binary->code[SPV_INDEX_MAGIC_NUMBER] = SPV_MAGIC_NUMBER;
binary->code[SPV_INDEX_VERSION_NUMBER] = SPV_VERSION_NUMBER;
binary->code[SPV_INDEX_GENERATOR_NUMBER] = SPV_GENERATOR_KHRONOS;
binary->code[SPV_INDEX_BOUND] = bound;
binary->code[SPV_INDEX_SCHEMA] = 0; // NOTE: Reserved
return SPV_SUCCESS;
}
// TODO(dneto): This API is not powerful enough in the case that the
// number and type of operands are not known until partway through parsing
// the operation. This happens when enum operands might have different number

8
source/binary.h
View File

@ -76,14 +76,6 @@ spv_result_t spvBinaryHeaderGet(const spv_binary binary,
const spv_endianness_t endian,
spv_header_t *pHeader);
/// @brief Populate a binary stream with this generators header
///
/// @param[in,out] binary the binary stream
/// @param[in] bound the upper ID bound
///
/// @return result code
spv_result_t spvBinaryHeaderSet(spv_binary binary, const uint32_t bound);
/// @brief Determine the type of the desired operand
///
/// @param[in] word the operand value

22
source/text.cpp
View File

@ -612,6 +612,25 @@ spv_result_t spvTextEncodeOpcode(const libspirv::AssemblyGrammar& grammar,
namespace {
/// @brief Populate a binary stream with this generator's header.
///
/// @param[in,out] binary the binary stream
/// @param[in] bound the upper ID bound
///
/// @return result code
spv_result_t SetHeader(spv_binary_t* binary, const uint32_t bound) {
if (!binary) return SPV_ERROR_INVALID_BINARY;
if (!binary->code || !binary->wordCount) return SPV_ERROR_INVALID_BINARY;
binary->code[SPV_INDEX_MAGIC_NUMBER] = SPV_MAGIC_NUMBER;
binary->code[SPV_INDEX_VERSION_NUMBER] = SPV_VERSION_NUMBER;
binary->code[SPV_INDEX_GENERATOR_NUMBER] = SPV_GENERATOR_KHRONOS;
binary->code[SPV_INDEX_BOUND] = bound;
binary->code[SPV_INDEX_SCHEMA] = 0; // NOTE: Reserved
return SPV_SUCCESS;
}
// Translates a given assembly language module into binary form.
// If a diagnostic is generated, it is not yet marked as being
// for a text-based input.
@ -673,8 +692,7 @@ spv_result_t spvTextToBinaryInternal(const libspirv::AssemblyGrammar& grammar,
binary->code = data;
binary->wordCount = totalSize;
spv_result_t error = spvBinaryHeaderSet(binary, context.getBound());
if (error) {
if (auto error = SetHeader(binary, context.getBound())) {
spvBinaryDestroy(binary);
return error;
}