ec3ed6a5eb
I have manually examined all of these diffs and restored a few files that seem to require manual adjustment. The following files still need to be modified manually, in a separate CL: android_sample/SampleApp/AndroidManifest.xml android_sample/SampleApp/res/layout/layout.xml android_sample/SampleApp/res/menu/sample.xml android_sample/SampleApp/res/values/strings.xml android_sample/SampleApp/src/com/skia/sampleapp/SampleApp.java android_sample/SampleApp/src/com/skia/sampleapp/SampleView.java experimental/CiCarbonSampleMain.c experimental/CocoaDebugger/main.m experimental/FileReaderApp/main.m experimental/SimpleCocoaApp/main.m experimental/iOSSampleApp/Shared/SkAlertPrompt.h experimental/iOSSampleApp/Shared/SkAlertPrompt.m experimental/iOSSampleApp/SkiOSSampleApp-Base.xcconfig experimental/iOSSampleApp/SkiOSSampleApp-Debug.xcconfig experimental/iOSSampleApp/SkiOSSampleApp-Release.xcconfig gpu/src/android/GrGLDefaultInterface_android.cpp gyp/common.gypi gyp_skia include/ports/SkHarfBuzzFont.h include/views/SkOSWindow_wxwidgets.h make.bat make.py src/opts/memset.arm.S src/opts/memset16_neon.S src/opts/memset32_neon.S src/opts/opts_check_arm.cpp src/ports/SkDebug_brew.cpp src/ports/SkMemory_brew.cpp src/ports/SkOSFile_brew.cpp src/ports/SkXMLParser_empty.cpp src/utils/ios/SkImageDecoder_iOS.mm src/utils/ios/SkOSFile_iOS.mm src/utils/ios/SkStream_NSData.mm tests/FillPathTest.cpp Review URL: http://codereview.appspot.com/4816058 git-svn-id: http://skia.googlecode.com/svn/trunk@1982 2bbb7eff-a529-9590-31e7-b0007b416f81
41 lines
719 B
C++
41 lines
719 B
C++
|
|
/*
|
|
* Copyright 2011 Google Inc.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
* found in the LICENSE file.
|
|
*/
|
|
#ifndef SkBenchGpuTimer_DEFINED
|
|
#define SkBenchGpuTimer_DEFINED
|
|
|
|
#if defined(SK_MESA)
|
|
#include <GL/osmesa.h>
|
|
|
|
#elif defined(SK_BUILD_FOR_WIN32)
|
|
#define WIN32_LEAN_AND_MEAN 1
|
|
#include <Windows.h>
|
|
#include <GL/GL.h>
|
|
|
|
#elif defined(SK_BUILD_FOR_MAC)
|
|
#include <OpenGL/gl.h>
|
|
|
|
#elif defined(SK_BUILD_FOR_UNIX)
|
|
#include <GL/gl.h>
|
|
|
|
#else
|
|
#error unsupported platform
|
|
#endif
|
|
|
|
class BenchGpuTimer {
|
|
public:
|
|
BenchGpuTimer();
|
|
~BenchGpuTimer();
|
|
void startGpu();
|
|
double endGpu();
|
|
private:
|
|
GLuint fQuery;
|
|
int fStarted;
|
|
};
|
|
|
|
#endif
|