immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improved code for loading and linking shaders

dev
Tomasz Kapuściński 2021-06-16 01:40:52 +02:00
parent fe02cf3e4b
commit 704e3f2f0d
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/graphics/opengl/glutil.cpp
View File

@ -471,9 +471,12 @@ GLint LoadShader(GLint type, const char* filename)
return 0; return 0;
} }
GLchar source[65536]; size_t len = PHYSFS_fileLength(file);
GLchar *sources[] = { source };
int length = PHYSFS_read(file, source, 1, 65536); std::vector<GLchar> source(len + 1);
GLchar *sources[] = { source.data() };
size_t length = PHYSFS_read(file, source.data(), 1, len);
source[length] = '\0'; source[length] = '\0';
PHYSFS_close(file); PHYSFS_close(file);
@ -503,7 +506,7 @@ GLint LoadShader(GLint type, const char* filename)
return shader; return shader;
} }
GLint LinkProgram(int count, GLint shaders[]) GLint LinkProgram(int count, const GLint* shaders)
{ {
GLint program = glCreateProgram(); GLint program = glCreateProgram();

2
src/graphics/opengl/glutil.h
View File

@ -99,7 +99,7 @@ std::string GetLastShaderError();
GLint LoadShader(GLint type, const char* filename); GLint LoadShader(GLint type, const char* filename);
GLint LinkProgram(int count, GLint shaders[]); GLint LinkProgram(int count, const GLint* shaders);
// TODO: Moved this here temporarily only to remove code duplication in CGLDeviceXX // TODO: Moved this here temporarily only to remove code duplication in CGLDeviceXX
struct PreparedTextureData struct PreparedTextureData