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

Side by Side Diff: bench/nanobench.cpp

Issue 405433008: Fix GLubyte to GrGLubyte. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 years, 5 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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2014 Google Inc. 2 * Copyright 2014 Google Inc.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 7
8 #include <ctype.h> 8 #include <ctype.h>
9 9
10 #include "Benchmark.h" 10 #include "Benchmark.h"
(...skipping 265 matching lines...) Expand 10 before | Expand all | Expand 10 after
276 log->option("system", "ANDROID"); 276 log->option("system", "ANDROID");
277 #elif defined(SK_BUILD_FOR_UNIX) 277 #elif defined(SK_BUILD_FOR_UNIX)
278 log->option("system", "UNIX"); 278 log->option("system", "UNIX");
279 #else 279 #else
280 log->option("system", "other"); 280 log->option("system", "other");
281 #endif 281 #endif
282 } 282 }
283 283
284 #if SK_SUPPORT_GPU 284 #if SK_SUPPORT_GPU
285 static void fill_gpu_options(ResultsWriter* log, SkGLContextHelper* ctx) { 285 static void fill_gpu_options(ResultsWriter* log, SkGLContextHelper* ctx) {
286 const GLubyte* version; 286 const GrGLubyte* version;
287 SK_GL_RET(*ctx, version, GetString(GR_GL_VERSION)); 287 SK_GL_RET(*ctx, version, GetString(GR_GL_VERSION));
288 log->configOption("GL_VERSION", (const char*)(version)); 288 log->configOption("GL_VERSION", (const char*)(version));
289 289
290 SK_GL_RET(*ctx, version, GetString(GR_GL_RENDERER)); 290 SK_GL_RET(*ctx, version, GetString(GR_GL_RENDERER));
291 log->configOption("GL_RENDERER", (const char*) version); 291 log->configOption("GL_RENDERER", (const char*) version);
292 292
293 SK_GL_RET(*ctx, version, GetString(GR_GL_VENDOR)); 293 SK_GL_RET(*ctx, version, GetString(GR_GL_VENDOR));
294 log->configOption("GL_VENDOR", (const char*) version); 294 log->configOption("GL_VENDOR", (const char*) version);
295 295
296 SK_GL_RET(*ctx, version, GetString(GR_GL_SHADING_LANGUAGE_VERSION)); 296 SK_GL_RET(*ctx, version, GetString(GR_GL_SHADING_LANGUAGE_VERSION));
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
426 } 426 }
427 427
428 return 0; 428 return 0;
429 } 429 }
430 430
431 #if !defined SK_BUILD_FOR_IOS 431 #if !defined SK_BUILD_FOR_IOS
432 int main(int argc, char * const argv[]) { 432 int main(int argc, char * const argv[]) {
433 return tool_main(argc, (char**) argv); 433 return tool_main(argc, (char**) argv);
434 } 434 }
435 #endif 435 #endif
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698