OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "base/string_piece.h" | 5 #include "base/string_piece.h" |
6 #include "base/sys_string_conversions.h" | 6 #include "base/sys_string_conversions.h" |
7 #include "chrome/common/gpu_create_command_buffer_config.h" | 7 #include "chrome/common/gpu_create_command_buffer_config.h" |
8 #include "chrome/common/gpu_info.h" | 8 #include "chrome/common/gpu_info.h" |
9 #include "chrome/common/dx_diag_node.h" | 9 #include "chrome/common/dx_diag_node.h" |
10 #include "gfx/rect.h" | 10 #include "gfx/rect.h" |
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
133 WriteParam(m, p.vendor_id()); | 133 WriteParam(m, p.vendor_id()); |
134 WriteParam(m, p.device_id()); | 134 WriteParam(m, p.device_id()); |
135 WriteParam(m, p.driver_vendor()); | 135 WriteParam(m, p.driver_vendor()); |
136 WriteParam(m, p.driver_version()); | 136 WriteParam(m, p.driver_version()); |
137 WriteParam(m, p.pixel_shader_version()); | 137 WriteParam(m, p.pixel_shader_version()); |
138 WriteParam(m, p.vertex_shader_version()); | 138 WriteParam(m, p.vertex_shader_version()); |
139 WriteParam(m, p.gl_version()); | 139 WriteParam(m, p.gl_version()); |
140 WriteParam(m, p.gl_version_string()); | 140 WriteParam(m, p.gl_version_string()); |
141 WriteParam(m, p.gl_vendor()); | 141 WriteParam(m, p.gl_vendor()); |
142 WriteParam(m, p.gl_renderer()); | 142 WriteParam(m, p.gl_renderer()); |
| 143 WriteParam(m, p.gl_extensions()); |
143 WriteParam(m, p.can_lose_context()); | 144 WriteParam(m, p.can_lose_context()); |
144 | 145 |
145 #if defined(OS_WIN) | 146 #if defined(OS_WIN) |
146 ParamTraits<DxDiagNode> ::Write(m, p.dx_diagnostics()); | 147 ParamTraits<DxDiagNode> ::Write(m, p.dx_diagnostics()); |
147 #endif | 148 #endif |
148 } | 149 } |
149 | 150 |
150 bool ParamTraits<GPUInfo> ::Read(const Message* m, void** iter, param_type* p) { | 151 bool ParamTraits<GPUInfo> ::Read(const Message* m, void** iter, param_type* p) { |
151 int32 progress; | 152 int32 progress; |
152 base::TimeDelta initialization_time; | 153 base::TimeDelta initialization_time; |
153 uint32 vendor_id; | 154 uint32 vendor_id; |
154 uint32 device_id; | 155 uint32 device_id; |
155 std::string driver_vendor; | 156 std::string driver_vendor; |
156 std::string driver_version; | 157 std::string driver_version; |
157 uint32 pixel_shader_version; | 158 uint32 pixel_shader_version; |
158 uint32 vertex_shader_version; | 159 uint32 vertex_shader_version; |
159 uint32 gl_version; | 160 uint32 gl_version; |
160 std::string gl_version_string; | 161 std::string gl_version_string; |
161 std::string gl_vendor; | 162 std::string gl_vendor; |
162 std::string gl_renderer; | 163 std::string gl_renderer; |
| 164 std::string gl_extensions; |
163 bool can_lose_context; | 165 bool can_lose_context; |
164 bool ret = ReadParam(m, iter, &progress); | 166 bool ret = ReadParam(m, iter, &progress); |
165 ret = ret && ReadParam(m, iter, &initialization_time); | 167 ret = ret && ReadParam(m, iter, &initialization_time); |
166 ret = ret && ReadParam(m, iter, &vendor_id); | 168 ret = ret && ReadParam(m, iter, &vendor_id); |
167 ret = ret && ReadParam(m, iter, &device_id); | 169 ret = ret && ReadParam(m, iter, &device_id); |
168 ret = ret && ReadParam(m, iter, &driver_vendor); | 170 ret = ret && ReadParam(m, iter, &driver_vendor); |
169 ret = ret && ReadParam(m, iter, &driver_version); | 171 ret = ret && ReadParam(m, iter, &driver_version); |
170 ret = ret && ReadParam(m, iter, &pixel_shader_version); | 172 ret = ret && ReadParam(m, iter, &pixel_shader_version); |
171 ret = ret && ReadParam(m, iter, &vertex_shader_version); | 173 ret = ret && ReadParam(m, iter, &vertex_shader_version); |
172 ret = ret && ReadParam(m, iter, &gl_version); | 174 ret = ret && ReadParam(m, iter, &gl_version); |
173 ret = ret && ReadParam(m, iter, &gl_version_string); | 175 ret = ret && ReadParam(m, iter, &gl_version_string); |
174 ret = ret && ReadParam(m, iter, &gl_vendor); | 176 ret = ret && ReadParam(m, iter, &gl_vendor); |
175 ret = ret && ReadParam(m, iter, &gl_renderer); | 177 ret = ret && ReadParam(m, iter, &gl_renderer); |
| 178 ret = ret && ReadParam(m, iter, &gl_extensions); |
176 ret = ret && ReadParam(m, iter, &can_lose_context); | 179 ret = ret && ReadParam(m, iter, &can_lose_context); |
177 p->SetProgress(static_cast<GPUInfo::Progress>(progress)); | 180 p->SetProgress(static_cast<GPUInfo::Progress>(progress)); |
178 if (!ret) | 181 if (!ret) |
179 return false; | 182 return false; |
180 | 183 |
181 p->SetInitializationTime(initialization_time); | 184 p->SetInitializationTime(initialization_time); |
182 p->SetVideoCardInfo(vendor_id, device_id); | 185 p->SetVideoCardInfo(vendor_id, device_id); |
183 p->SetDriverInfo(driver_vendor, driver_version); | 186 p->SetDriverInfo(driver_vendor, driver_version); |
184 p->SetShaderVersion(pixel_shader_version, vertex_shader_version); | 187 p->SetShaderVersion(pixel_shader_version, vertex_shader_version); |
185 p->SetGLVersion(gl_version); | 188 p->SetGLVersion(gl_version); |
186 p->SetGLVersionString(gl_version_string); | 189 p->SetGLVersionString(gl_version_string); |
187 p->SetGLVendor(gl_vendor); | 190 p->SetGLVendor(gl_vendor); |
188 p->SetGLRenderer(gl_renderer); | 191 p->SetGLRenderer(gl_renderer); |
| 192 p->SetGLExtensions(gl_extensions); |
189 p->SetCanLoseContext(can_lose_context); | 193 p->SetCanLoseContext(can_lose_context); |
190 | 194 |
191 #if defined(OS_WIN) | 195 #if defined(OS_WIN) |
192 DxDiagNode dx_diagnostics; | 196 DxDiagNode dx_diagnostics; |
193 if (!ReadParam(m, iter, &dx_diagnostics)) | 197 if (!ReadParam(m, iter, &dx_diagnostics)) |
194 return false; | 198 return false; |
195 | 199 |
196 p->SetDxDiagnostics(dx_diagnostics); | 200 p->SetDxDiagnostics(dx_diagnostics); |
197 #endif | 201 #endif |
198 | 202 |
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
275 } | 279 } |
276 return true; | 280 return true; |
277 } | 281 } |
278 | 282 |
279 void ParamTraits<GPUCreateCommandBufferConfig> ::Log( | 283 void ParamTraits<GPUCreateCommandBufferConfig> ::Log( |
280 const param_type& p, std::string* l) { | 284 const param_type& p, std::string* l) { |
281 l->append("<GPUCreateCommandBufferConfig>"); | 285 l->append("<GPUCreateCommandBufferConfig>"); |
282 } | 286 } |
283 | 287 |
284 } // namespace IPC | 288 } // namespace IPC |
OLD | NEW |