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

Side by Side Diff: src/views/win/SkOSWindow_win.cpp

Issue 1338003002: skia: Add ANGLE with GL backend to nanobench/DM (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: remove PictureRenderer changes Created 5 years, 3 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
« no previous file with comments | « src/gpu/gl/angle/SkANGLEGLContext.cpp ('k') | tests/SkpSkGrTest.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 1
2 /* 2 /*
3 * Copyright 2011 Google Inc. 3 * Copyright 2011 Google Inc.
4 * 4 *
5 * Use of this source code is governed by a BSD-style license that can be 5 * Use of this source code is governed by a BSD-style license that can be
6 * found in the LICENSE file. 6 * found in the LICENSE file.
7 */ 7 */
8 #include "SkTypes.h" 8 #include "SkTypes.h"
9 9
10 #if defined(SK_BUILD_FOR_WIN) 10 #if defined(SK_BUILD_FOR_WIN)
(...skipping 400 matching lines...) Expand 10 before | Expand all | Expand 10 after
411 EGL_BLUE_SIZE, 8, 411 EGL_BLUE_SIZE, 8,
412 EGL_ALPHA_SIZE, 8, 412 EGL_ALPHA_SIZE, 8,
413 EGL_DEPTH_SIZE, 8, 413 EGL_DEPTH_SIZE, 8,
414 EGL_STENCIL_SIZE, 8, 414 EGL_STENCIL_SIZE, 8,
415 EGL_NONE 415 EGL_NONE
416 }; 416 };
417 static const EGLint surfaceAttribList[] = { 417 static const EGLint surfaceAttribList[] = {
418 EGL_NONE, EGL_NONE 418 EGL_NONE, EGL_NONE
419 }; 419 };
420 420
421 EGLDisplay display = SkANGLEGLContext::GetD3DEGLDisplay(GetDC(hWnd)); 421 EGLDisplay display = SkANGLEGLContext::GetD3DEGLDisplay(GetDC(hWnd), false);
422 422
423 if (EGL_NO_DISPLAY == display) { 423 if (EGL_NO_DISPLAY == display) {
424 SkDebugf("Could not create ANGLE egl display!\n"); 424 SkDebugf("Could not create ANGLE egl display!\n");
425 return false; 425 return false;
426 } 426 }
427 427
428 // Initialize EGL 428 // Initialize EGL
429 EGLint majorVersion, minorVersion; 429 EGLint majorVersion, minorVersion;
430 if (!eglInitialize(display, &majorVersion, &minorVersion)) { 430 if (!eglInitialize(display, &majorVersion, &minorVersion)) {
431 return false; 431 return false;
(...skipping 336 matching lines...) Expand 10 before | Expand all | Expand 10 after
768 } 768 }
769 769
770 void SkOSWindow::closeWindow() { 770 void SkOSWindow::closeWindow() {
771 DestroyWindow((HWND)fHWND); 771 DestroyWindow((HWND)fHWND);
772 if (fFullscreen) { 772 if (fFullscreen) {
773 DestroyWindow((HWND)fSavedWindowState.fHWND); 773 DestroyWindow((HWND)fSavedWindowState.fHWND);
774 } 774 }
775 gHwndToOSWindowMap.remove(fHWND); 775 gHwndToOSWindowMap.remove(fHWND);
776 } 776 }
777 #endif 777 #endif
OLDNEW
« no previous file with comments | « src/gpu/gl/angle/SkANGLEGLContext.cpp ('k') | tests/SkpSkGrTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698