client/deps/glbench/src/main.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/main.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/main.h

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

index eb8e1508d5ec38ba9f4885a660c148ef3289105b..a98efd3b377262dfe0ce867839f36c723fcf1928 100644

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

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

@@ -8,10 +8,10 @@

#include <gflags/gflags.h>

#include <sys/time.h>

-#ifdef USE_EGL

+#if defined(USE_OPENGLES)

#include <GLES2/gl2.h>

#include <EGL/egl.h>

-#else

+#elif defined(USE_OPENGL)

#include <GL/gl.h>

#include <GL/glx.h>

@@ -47,6 +47,8 @@

LIST_PROC_FUNCTIONS(F)

#undef F

+#else

+#error bad graphics backend

#endif

inline uint64_t GetUTime() {

« no previous file with comments | « client/deps/glbench/src/egl_stuff.cc ('k') | client/deps/glbench/src/main.cc » ('j') | no next file with comments »