Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(281)

Side by Side Diff: Source/core/html/canvas/WebGLRenderingContext.cpp

Issue 826363002: Webgl Info should have vendorid and deviceid of gpu. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009 Apple Inc. All rights reserved. 2 * Copyright (C) 2009 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 blink::WebGraphicsContext3D::Attributes wgc3dAttributes = toWebGraphicsConte xt3DAttributes(attributes, document.topDocument().url().string(), settings, 1); 85 blink::WebGraphicsContext3D::Attributes wgc3dAttributes = toWebGraphicsConte xt3DAttributes(attributes, document.topDocument().url().string(), settings, 1);
86 blink::WebGLInfo glInfo; 86 blink::WebGLInfo glInfo;
87 OwnPtr<blink::WebGraphicsContext3D> context = adoptPtr(blink::Platform::curr ent()->createOffscreenGraphicsContext3D(wgc3dAttributes, 0, &glInfo)); 87 OwnPtr<blink::WebGraphicsContext3D> context = adoptPtr(blink::Platform::curr ent()->createOffscreenGraphicsContext3D(wgc3dAttributes, 0, &glInfo));
88 if (!context || shouldFailContextCreationForTesting) { 88 if (!context || shouldFailContextCreationForTesting) {
89 shouldFailContextCreationForTesting = false; 89 shouldFailContextCreationForTesting = false;
90 String statusMessage; 90 String statusMessage;
91 if (!glInfo.contextInfoCollectionFailure.isEmpty()) { 91 if (!glInfo.contextInfoCollectionFailure.isEmpty()) {
92 statusMessage.append("Could not create a WebGL context. "); 92 statusMessage.append("Could not create a WebGL context. ");
93 statusMessage.append(glInfo.contextInfoCollectionFailure); 93 statusMessage.append(glInfo.contextInfoCollectionFailure);
94 } else { 94 } else {
95 statusMessage.append("Could not create a WebGL context"); 95 statusMessage.append("Could not create a WebGL context ");
philipj_slow 2015/01/15 09:55:00 Maybe a period after context like in the above str
sivag 2015/01/15 14:50:59 Done.
96 statusMessage.append("VendorId = " + String::number(glInfo.vendorId) );
97 statusMessage.append(", DriverId = " + String::number(glInfo.deviceI d));
96 if (!glInfo.vendorInfo.isEmpty()) { 98 if (!glInfo.vendorInfo.isEmpty()) {
97 statusMessage.append(" VendorInfo = "); 99 statusMessage.append(" VendorInfo = ");
98 statusMessage.append(glInfo.vendorInfo); 100 statusMessage.append(glInfo.vendorInfo);
99 } else { 101 } else {
100 statusMessage.append(" VendorInfo = Not Available"); 102 statusMessage.append(" VendorInfo = Not Available");
101 } 103 }
102 if (!glInfo.rendererInfo.isEmpty()) { 104 if (!glInfo.rendererInfo.isEmpty()) {
103 statusMessage.append(", RendererInfo = "); 105 statusMessage.append(", RendererInfo = ");
104 statusMessage.append(glInfo.rendererInfo); 106 statusMessage.append(glInfo.rendererInfo);
105 } else { 107 } else {
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
201 visitor->trace(m_webglDepthTexture); 203 visitor->trace(m_webglDepthTexture);
202 WebGLRenderingContextBase::trace(visitor); 204 WebGLRenderingContextBase::trace(visitor);
203 } 205 }
204 206
205 void WebGLRenderingContext::forceNextWebGLContextCreationToFail() 207 void WebGLRenderingContext::forceNextWebGLContextCreationToFail()
206 { 208 {
207 shouldFailContextCreationForTesting = true; 209 shouldFailContextCreationForTesting = true;
208 } 210 }
209 211
210 } // namespace blink 212 } // namespace blink
OLDNEW
« no previous file with comments | « LayoutTests/fast/canvas/webgl/webgl-error-response.html ('k') | public/platform/WebGraphicsContext3D.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698