client/deps/glbench/src/utils.h - Issue 2122020: Fixes for GLES systems.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2122020: Fixes for GLES systems. (Closed) Base URL: ssh://git@chromiumos-git//autotest.git

Patch Set: ...and removed bogus #-I from Makefile 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:

Index: client/deps/glbench/src/utils.h

diff --git a/client/deps/glbench/src/utils.h b/client/deps/glbench/src/utils.h

index 117454c5063c208c987e03e655519ece504d7b31..20fce9244f61b45f8a322f06ae6cd5cf5c4e32d2 100644

--- a/client/deps/glbench/src/utils.h

+++ b/client/deps/glbench/src/utils.h

@@ -5,9 +5,9 @@

#ifndef BENCH_GL_UTILS_H_

#define BENCH_GL_UTILS_H_

-#ifdef USE_EGL

+#if defined(USE_OPENGLES)

#include "GLES2/gl2.h"

-#else

+#elif defined(USE_OPENGL)

#include "GL/gl.h"

#endif

@@ -25,8 +25,6 @@ int CreateMesh(GLuint **indices, GLsizeiptr *size,

int width, int height, int culled_ratio);

GLuint InitShaderProgram(const char *vertex_src, const char *fragment_src);

-#define I915_WORKAROUND 1

} // namespace glbench

#endif // BENCH_GL_UTILS_H_