| Index: mojo/services/gles2/command_buffer_type_conversions.cc
|
| diff --git a/mojo/services/gles2/command_buffer_type_conversions.cc b/mojo/services/gles2/command_buffer_type_conversions.cc
|
| index 79b00197ed605d2d29499312f2dfac74eb579c95..3952bef3179688b4a9407c092d650bca2e35a3e8 100644
|
| --- a/mojo/services/gles2/command_buffer_type_conversions.cc
|
| +++ b/mojo/services/gles2/command_buffer_type_conversions.cc
|
| @@ -8,33 +8,32 @@
|
|
|
| namespace mojo {
|
|
|
| -CommandBufferState
|
| -TypeConverter<CommandBufferState, gpu::CommandBuffer::State>::ConvertFrom(
|
| - const gpu::CommandBuffer::State& input,
|
| - Buffer* buffer) {
|
| - CommandBufferState::Builder result(buffer);
|
| - result.set_num_entries(input.num_entries);
|
| - result.set_get_offset(input.get_offset);
|
| - result.set_put_offset(input.put_offset);
|
| - result.set_token(input.token);
|
| - result.set_error(input.error);
|
| - result.set_context_lost_reason(input.context_lost_reason);
|
| - result.set_generation(input.generation);
|
| - return result.Finish();
|
| +CommandBufferStatePtr
|
| +TypeConverter<CommandBufferStatePtr, gpu::CommandBuffer::State>::ConvertFrom(
|
| + const gpu::CommandBuffer::State& input) {
|
| + CommandBufferStatePtr result(CommandBufferState::New());
|
| + result->num_entries = input.num_entries;
|
| + result->get_offset = input.get_offset;
|
| + result->put_offset = input.put_offset;
|
| + result->token = input.token;
|
| + result->error = input.error;
|
| + result->context_lost_reason = input.context_lost_reason;
|
| + result->generation = input.generation;
|
| + return result.Pass();
|
| }
|
|
|
| gpu::CommandBuffer::State
|
| -TypeConverter<CommandBufferState, gpu::CommandBuffer::State>::ConvertTo(
|
| - const CommandBufferState& input) {
|
| +TypeConverter<CommandBufferStatePtr, gpu::CommandBuffer::State>::ConvertTo(
|
| + const CommandBufferStatePtr& input) {
|
| gpu::CommandBuffer::State state;
|
| - state.num_entries = input.num_entries();
|
| - state.get_offset = input.get_offset();
|
| - state.put_offset = input.put_offset();
|
| - state.token = input.token();
|
| - state.error = static_cast<gpu::error::Error>(input.error());
|
| + state.num_entries = input->num_entries;
|
| + state.get_offset = input->get_offset;
|
| + state.put_offset = input->put_offset;
|
| + state.token = input->token;
|
| + state.error = static_cast<gpu::error::Error>(input->error);
|
| state.context_lost_reason =
|
| - static_cast<gpu::error::ContextLostReason>(input.context_lost_reason());
|
| - state.generation = input.generation();
|
| + static_cast<gpu::error::ContextLostReason>(input->context_lost_reason);
|
| + state.generation = input->generation;
|
| return state;
|
| }
|
|
|
|
|