| Index: samplecode/SampleApp.cpp
|
| diff --git a/samplecode/SampleApp.cpp b/samplecode/SampleApp.cpp
|
| index 7ebac5f2151867e6d9604e9725cd08c80fe87785..5b133106774d83c84e4a5cae16bc7922d13ecb03 100644
|
| --- a/samplecode/SampleApp.cpp
|
| +++ b/samplecode/SampleApp.cpp
|
| @@ -206,9 +206,9 @@ public:
|
| break;
|
| #endif // SK_ANGLE
|
| #if SK_COMMAND_BUFFER
|
| - case kCommandBuffer_DeviceType:
|
| + case kCommandBufferES2_DeviceType:
|
| // Command buffer is really the only other odd man out :D
|
| - fBackend = kCommandBuffer_BackEndType;
|
| + fBackend = kCommandBufferES2_BackEndType;
|
| break;
|
| #endif // SK_COMMAND_BUFFER
|
| default:
|
| @@ -237,7 +237,7 @@ public:
|
| break;
|
| #endif // SK_ANGLE
|
| #if SK_COMMAND_BUFFER
|
| - case kCommandBuffer_DeviceType:
|
| + case kCommandBufferES2_DeviceType:
|
| glInterface.reset(GrGLCreateCommandBufferInterface());
|
| break;
|
| #endif // SK_COMMAND_BUFFER
|
| @@ -692,7 +692,7 @@ static inline SampleWindow::DeviceType cycle_devicetype(SampleWindow::DeviceType
|
| , SampleWindow::kANGLE_DeviceType
|
| #endif // SK_ANGLE
|
| #if SK_COMMAND_BUFFER
|
| - , SampleWindow::kCommandBuffer_DeviceType
|
| + , SampleWindow::kCommandBufferES2_DeviceType
|
| #endif // SK_COMMAND_BUFFER
|
| #endif // SK_SUPPORT_GPU
|
| };
|
| @@ -859,7 +859,7 @@ SampleWindow::SampleWindow(void* hwnd, int argc, char** argv, DeviceManager* dev
|
| fDeviceType = kANGLE_DeviceType;
|
| #endif
|
| #if SK_COMMAND_BUFFER && DEFAULT_TO_COMMAND_BUFFER
|
| - fDeviceType = kCommandBuffer_DeviceType;
|
| + fDeviceType = kCommandBufferES2_DeviceType;
|
| #endif
|
|
|
| fUseClip = false;
|
|
|