Skip to content

header fix #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Dalmurii merged 2 commits into from
Aug 7, 2025
Merged

header fix #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fd091a3
C interface header
Dalmurii Aug 5, 2025
dfb29e6
Hotfix: stddef.h is needed for size_t
Dalmurii Aug 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 31 additions & 10 deletions include/clspv/Compiler.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,18 @@
#ifndef CLSPV_INCLUDE_CLSPV_COMPILER_H_
#define CLSPV_INCLUDE_CLSPV_COMPILER_H_

#ifdef __cplusplus
#include <cstdint>
#include <cstdlib>
#include <string>
#include <vector>
#else
#include <stdint.h>
#include <stdlib.h>
#include <stddef.h>
#endif

#ifdef __cplusplus
namespace clspv {
// DEPRECATED: This function will be replaced by an expanded API.
int Compile(const int argc, const char *const argv[]);
Expand All @@ -44,6 +51,7 @@ int CompileFromSourcesString(const std::vector<std::string> &programs,
std::vector<uint32_t> *output_buffer,
std::string *output_log);
} // namespace clspv
#endif

// C API
typedef enum ClspvError {
Expand All @@ -59,6 +67,14 @@ typedef enum ClspvError {
#define EXPORT __attribute__((visibility("default")))
#endif

#ifndef clspv_restrict

/** Optional restrict qualifier for given C API with C++ implementation where
* restrict is not the thing. */
#define clspv_restrict

#endif

#ifdef __cplusplus
extern "C" {
#endif
Expand All @@ -74,22 +90,27 @@ extern "C" {
// |options| - String of options to pass to Clspv compiler.
// |output_binary| - Handle to compiler output/result.
// |output_binary_size| - Size of compiler output/result (in bytes).
// |output_log| - Handle to compiler build log.
// |output_log| - Handle to compiler build log,
// will assume log is not needed if param is NULL.
// its value will be NULL when no build log is empty.
EXPORT ClspvError clspvCompileFromSourcesString(
const size_t program_count, const size_t *program_sizes,
const char **programs, const char *options, char **output_binary,
size_t *output_binary_size, char **output_log);
const size_t program_count, const size_t *clspv_restrict program_sizes,
const char *const clspv_restrict *clspv_restrict programs,
const char *clspv_restrict options,
char *clspv_restrict *clspv_restrict output_binary,
size_t *clspv_restrict output_binary_size,
char *clspv_restrict *clspv_restrict output_log_opt);

// Frees the output memory from clspvCompileFromSourcesString
//
// |output_binary| - Handle to spv
// |output_log| - Handle to compiler build log
static inline void clspvFreeOutputBuildObjs(char *output_binary,
char *output_log) {
free(output_binary);
output_binary = NULL;
free(output_log);
output_log = NULL;
static inline void clspvFreeOutputBuildObjs(char *clspv_restrict output_binary,
char *clspv_restrict output_log) {
if (output_binary)
free(output_binary);
if (output_log)
free(output_log);
}

#ifdef __cplusplus
Expand Down
7 changes: 3 additions & 4 deletions lib/Compiler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ clang::TargetInfo *PrepareTargetInfo(CompilerInstance &instance) {
enabled) {
instance.getPreprocessorOpts().addMacroDef(str);
}
if (feat == clspv::FeatureMacro::__opencl_c_int64 && !enabled){
if (feat == clspv::FeatureMacro::__opencl_c_int64 && !enabled) {
instance.getPreprocessorOpts().addMacroUndef(str);
}
}
Expand Down Expand Up @@ -712,7 +712,7 @@ int RunPassPipeline(llvm::Module &M, llvm::raw_svector_ostream *binaryStream) {
pm.addPass(clspv::SimplifyPointerBitcastPass());
pm.addPass(clspv::ReplacePointerBitcastPass());
pm.addPass(llvm::createModuleToFunctionPassAdaptor(llvm::DCEPass()));

pm.addPass(clspv::UndoTranslateSamplerFoldPass());

if (clspv::Option::ModuleConstantsInStorageBuffer()) {
Expand Down Expand Up @@ -1206,7 +1206,6 @@ int CompilePrograms(const std::vector<std::string> &programs,
ProgramToModule(context, "source", program, output_log, &error));
if (error != 0)
return error;

}
assert(modules.size() > 0 && modules.back() != nullptr);

Expand Down Expand Up @@ -1352,7 +1351,7 @@ int CompileFromSourceString(const std::string &program,
// C API
ClspvError clspvCompileFromSourcesString(
const size_t program_count, const size_t *program_sizes,
const char **programs, const char *options, char **output_binary,
const char *const *programs, const char *options, char **output_binary,
size_t *output_binary_size, char **output_log) {
if (programs == nullptr || program_count == 0 || output_binary == nullptr ||
output_binary_size == nullptr) {
Expand Down