| Index: client/deps/glbench/src/utils.cc
|
| diff --git a/client/deps/glbench/src/utils.cc b/client/deps/glbench/src/utils.cc
|
| index 4d2aca4a908da3db65cb680a453c19692cbf7d33..8709faffccdbae6ffd499446e383e60d932e3456 100644
|
| --- a/client/deps/glbench/src/utils.cc
|
| +++ b/client/deps/glbench/src/utils.cc
|
| @@ -165,11 +165,23 @@ static void print_info_log(int obj)
|
| }
|
|
|
| GLuint InitShaderProgram(const char *vertex_src, const char *fragment_src) {
|
| + return InitShaderProgramWithHeader(NULL, vertex_src, fragment_src);
|
| +}
|
| +
|
| +GLuint InitShaderProgramWithHeader(const char* header,
|
| + const char* vertex_src,
|
| + const char* fragment_src) {
|
| GLuint vertex_shader = glCreateShader(GL_VERTEX_SHADER);
|
| GLuint fragment_shader = glCreateShader(GL_FRAGMENT_SHADER);
|
|
|
| - glShaderSource(vertex_shader, 1, &vertex_src, NULL);
|
| - glShaderSource(fragment_shader, 1, &fragment_src, NULL);
|
| + const char* header_and_body[2];
|
| + header_and_body[0] = header ? header : "";
|
| + header_and_body[1] = vertex_src;
|
| + glShaderSource(vertex_shader,
|
| + arraysize(header_and_body), header_and_body, NULL);
|
| + header_and_body[1] = fragment_src;
|
| + glShaderSource(fragment_shader,
|
| + arraysize(header_and_body), header_and_body, NULL);
|
|
|
| glCompileShader(vertex_shader);
|
| print_info_log(vertex_shader);
|
|
|