thek0tyara/llama-cpp-turboquant
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Updated to use shader statics

Browse source
This commit is contained in:
Alejandro Saucedo 2021-02-20 17:06:54 +00:00
parent 9a19e3b280
commit 2fb0641de0
10 changed files with 85 additions and 131 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/include/kompute/ShaderUtil.hpp → src/Shader.cpp
View file

@ -1,20 +1,13 @@
#pragma once
#include <iostream>
#include <vector>
#include "Core.hpp"
#include <glslang/Public/ShaderLang.h>
#include <StandAlone/ResourceLimits.h>
#include <SPIRV/GlslangToSpv.h>
#include "kompute/Shader.hpp"
namespace kp {
static std::vector<char> spirv_from_sources(const std::vector<std::string>& sources,
const std::vector<std::string>& files = {},
const std::string& entryPoint = "main",
std::vector<std::pair<std::string,std::string>> definitions = {}) {
std::vector<char>
Shader::compile(const std::vector<std::string>& sources,
const std::vector<std::string>& files,
const std::string& entryPoint,
std::vector<std::pair<std::string,std::string>> definitions) {
// Initialize glslang library.
glslang::InitializeProcess();
@ -91,8 +84,11 @@ static std::vector<char> spirv_from_sources(const std::vector<std::string>& sour
return std::vector<char>((char*)spirv.data(), (char*)(spirv.data()+spirv.size()) );
}
static std::vector<char> spirv_from_source(const std::string& source) {
return spirv_from_sources({source});
std::vector<char>
Shader::compile(const std::string& source,
const std::string& entryPoint,
std::vector<std::pair<std::string,std::string>> definitions) {
return compile({source});
}
}

28
src/include/kompute/Shader.hpp Normal file
View file

@ -0,0 +1,28 @@
#pragma once
#include <iostream>
#include <vector>
#include "Core.hpp"
#include <glslang/Public/ShaderLang.h>
#include <StandAlone/ResourceLimits.h>
#include <SPIRV/GlslangToSpv.h>
namespace kp {
class Shader {
public:
static std::vector<char> compile(
const std::vector<std::string>& sources,
const std::vector<std::string>& files = {},
const std::string& entryPoint = "main",
std::vector<std::pair<std::string,std::string>> definitions = {});
static std::vector<char> compile(
const std::string& source,
const std::string& entryPoint = "main",
std::vector<std::pair<std::string,std::string>> definitions = {});
};
}