Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1018)

Unified Diff: client/deps/glbench/src/utils.cc

Issue 2152003: Moved selection of I915 hack out of the YUV shader. (Closed) Base URL: ssh://git@chromiumos-git//autotest.git
Patch Set: Created 10 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « client/deps/glbench/src/utils.h ('k') | client/deps/glbench/src/yuv2rgb_1.glslf » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
« no previous file with comments | « client/deps/glbench/src/utils.h ('k') | client/deps/glbench/src/yuv2rgb_1.glslf » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698