allemang.d/toddcox-visualize
1
0
Fork 0
mirror of https://github.com/allemangD/toddcox-visualize.git synced 2025-11-10 12:02:47 -05:00
Code Issues Packages Projects Releases Wiki Activity

use program pipelines instead

Browse Source
This commit is contained in:
David Allemang
2020-01-27 18:51:55 -05:00
parent 53aa778446
commit 794bf15d7f
5 changed files with 78 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
vis/include/util.hpp
View File

@@ -29,6 +29,26 @@ public:
explicit program_error(const char *string) : gl_error(string) {}
};
template<class T, GLenum prop>
T utilGetShader(GLuint shader) {
GLint res;
glGetShaderiv(shader, prop, &res);
return static_cast<T>(res);
}
#define getShaderInfoLogLength utilGetShader<size_t, GL_INFO_LOG_LENGTH>
#define getShaderCompileStatus utilGetShader<size_t, GL_COMPILE_STATUS>
template<class T, GLenum prop>
T utilGetProgram(GLuint program) {
GLint res;
glGetProgramiv(program, prop, &res);
return static_cast<T>(res);
}
#define getProgramInfoLogLength utilGetProgram<size_t, GL_INFO_LOG_LENGTH>
#define getProgramLinkStatus utilGetProgram<size_t, GL_LINK_STATUS>
void utilShaderSource(GLuint shader, const std::vector<std::string> &sources) {
char const *ptrs[sources.size()];
for (size_t i = 0; i < sources.size(); ++i) {
@@ -37,17 +57,15 @@ void utilShaderSource(GLuint shader, const std::vector<std::string> &sources) {
glShaderSource(shader, sources.size(), ptrs, nullptr);
}
std::string utilShaderInfoLog(GLuint shader) {
int len;
glGetShaderiv(shader, GL_INFO_LOG_LENGTH, &len);
std::string getShaderInfoLog(GLuint shader) {
int len = getShaderInfoLogLength(shader);
char buffer[len];
glGetShaderInfoLog(shader, len, nullptr, buffer);
return std::string(buffer);
}
std::string utilProgramInfoLog(GLuint program) {
int len;
glGetProgramiv(program, GL_INFO_LOG_LENGTH, &len);
std::string getProgramInfoLog(GLuint program) {
int len = getProgramInfoLogLength(program);
char buffer[len];
glGetProgramInfoLog(program, len, nullptr, buffer);
return std::string(buffer);
@@ -86,11 +104,9 @@ GLuint utilCompileFiles(const GLenum type, const std::vector<std::string> &files
utilShaderSource(shader, sources);
glCompileShader(shader);
int success;
glGetShaderiv(shader, GL_COMPILE_STATUS, &success);
if (success) return shader;
if (getShaderCompileStatus(shader)) return shader;
throw shader_error(utilShaderInfoLog(shader));
throw shader_error(getShaderInfoLog(shader));
}
GLuint utilLinkProgram(const std::vector<GLuint> &shaders) {
@@ -100,9 +116,26 @@ GLuint utilLinkProgram(const std::vector<GLuint> &shaders) {
}
glLinkProgram(program);
int success;
glGetProgramiv(program, GL_LINK_STATUS, &success);
if (success)return program;
if (getProgramLinkStatus(program)) return program;
throw program_error(utilProgramInfoLog(program));
throw program_error(getProgramInfoLog(program));
}
GLuint utilCreateShaderProgram(GLenum type, const std::vector<std::string> &src) {
std::vector<const char *> c_str(src.size());
std::transform(src.begin(), src.end(), c_str.begin(), [](auto &str) {
return str.c_str();
});
GLuint program = glCreateShaderProgramv(type, src.size(), &c_str[0]);
if (getProgramLinkStatus(program)) return program;
throw program_error(getProgramInfoLog(program));
}
GLuint utilCreateShaderProgramFile(GLenum type, const std::vector<std::string> &files) {
std::vector<std::string> sources(files.size());
std::transform(files.begin(), files.end(), sources.begin(), utilReadFile);
return utilCreateShaderProgram(type, sources);
}