| Index: gpu/ipc/common/gpu_param_traits_macros.h
|
| diff --git a/gpu/ipc/common/gpu_param_traits_macros.h b/gpu/ipc/common/gpu_param_traits_macros.h
|
| index 514f464c8fdde41b4cfc74ed2eefdb6ffab6b0cd..6833ff1c136d87c6ef549752abbdbe360bf02db3 100644
|
| --- a/gpu/ipc/common/gpu_param_traits_macros.h
|
| +++ b/gpu/ipc/common/gpu_param_traits_macros.h
|
| @@ -6,7 +6,6 @@
|
| #define GPU_IPC_COMMON_GPU_PARAM_TRAITS_MACROS_H_
|
|
|
| #include "gpu/command_buffer/common/constants.h"
|
| -#include "gpu/command_buffer/common/gles2_cmd_utils.h"
|
| #include "gpu/command_buffer/common/gpu_memory_allocation.h"
|
| #include "gpu/config/gpu_info.h"
|
| #include "gpu/gpu_export.h"
|
| @@ -14,7 +13,6 @@
|
| #include "ipc/ipc_message_macros.h"
|
| #include "ui/gfx/ipc/geometry/gfx_param_traits.h"
|
| #include "ui/gfx/ipc/gfx_param_traits.h"
|
| -#include "ui/gl/gpu_preference.h"
|
| #include "url/ipc/url_param_traits.h"
|
|
|
| #undef IPC_MESSAGE_EXPORT
|
| @@ -39,7 +37,6 @@ IPC_STRUCT_TRAITS_BEGIN(gpu::VideoEncodeAcceleratorSupportedProfile)
|
| IPC_STRUCT_TRAITS_MEMBER(max_framerate_denominator)
|
| IPC_STRUCT_TRAITS_END()
|
|
|
| -IPC_ENUM_TRAITS_MAX_VALUE(gl::GpuPreference, gl::GpuPreferenceLast)
|
| IPC_ENUM_TRAITS_MAX_VALUE(gpu::GpuStreamPriority, gpu::GpuStreamPriority::LAST)
|
| IPC_ENUM_TRAITS_MAX_VALUE(gpu::MemoryAllocation::PriorityCutoff,
|
| gpu::MemoryAllocation::CUTOFF_LAST)
|
| @@ -51,8 +48,6 @@ IPC_ENUM_TRAITS_MIN_MAX_VALUE(gpu::CollectInfoResult,
|
| IPC_ENUM_TRAITS_MIN_MAX_VALUE(gpu::VideoCodecProfile,
|
| gpu::VIDEO_CODEC_PROFILE_MIN,
|
| gpu::VIDEO_CODEC_PROFILE_MAX)
|
| -IPC_ENUM_TRAITS_MAX_VALUE(gpu::gles2::ContextType,
|
| - gpu::gles2::CONTEXT_TYPE_LAST)
|
|
|
| IPC_STRUCT_TRAITS_BEGIN(gpu::DxDiagNode)
|
| IPC_STRUCT_TRAITS_MEMBER(values)
|
| @@ -113,23 +108,5 @@ IPC_STRUCT_TRAITS_BEGIN(gpu::MemoryAllocation)
|
| IPC_STRUCT_TRAITS_MEMBER(priority_cutoff_when_visible)
|
| IPC_STRUCT_TRAITS_END()
|
|
|
| -IPC_STRUCT_TRAITS_BEGIN(gpu::gles2::ContextCreationAttribHelper)
|
| - IPC_STRUCT_TRAITS_MEMBER(offscreen_framebuffer_size)
|
| - IPC_STRUCT_TRAITS_MEMBER(gpu_preference)
|
| - IPC_STRUCT_TRAITS_MEMBER(alpha_size)
|
| - IPC_STRUCT_TRAITS_MEMBER(blue_size)
|
| - IPC_STRUCT_TRAITS_MEMBER(green_size)
|
| - IPC_STRUCT_TRAITS_MEMBER(red_size)
|
| - IPC_STRUCT_TRAITS_MEMBER(depth_size)
|
| - IPC_STRUCT_TRAITS_MEMBER(stencil_size)
|
| - IPC_STRUCT_TRAITS_MEMBER(samples)
|
| - IPC_STRUCT_TRAITS_MEMBER(sample_buffers)
|
| - IPC_STRUCT_TRAITS_MEMBER(buffer_preserved)
|
| - IPC_STRUCT_TRAITS_MEMBER(bind_generates_resource)
|
| - IPC_STRUCT_TRAITS_MEMBER(fail_if_major_perf_caveat)
|
| - IPC_STRUCT_TRAITS_MEMBER(lose_context_when_out_of_memory)
|
| - IPC_STRUCT_TRAITS_MEMBER(context_type)
|
| -IPC_STRUCT_TRAITS_END()
|
| -
|
|
|
| #endif // GPU_IPC_COMMON_GPU_PARAM_TRAITS_MACROS_H_
|
|
|