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

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

Issue 1684413003: Implement support for using GL ES 3.0 with command buffer (Closed) Base URL: https://skia.googlesource.com/skia.git@no-texture-rectangle-gles
Patch Set: egl destruction update Created 4 years, 10 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 /* 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 599 matching lines...) Expand 10 before | Expand all | Expand 10 after
610 #if SK_SUPPORT_GPU 610 #if SK_SUPPORT_GPU
611 case kNativeGL_BackEndType: 611 case kNativeGL_BackEndType:
612 result = attachGL(msaaSampleCount, info); 612 result = attachGL(msaaSampleCount, info);
613 break; 613 break;
614 #if SK_ANGLE 614 #if SK_ANGLE
615 case kANGLE_BackEndType: 615 case kANGLE_BackEndType:
616 result = attachANGLE(msaaSampleCount, info); 616 result = attachANGLE(msaaSampleCount, info);
617 break; 617 break;
618 #endif // SK_ANGLE 618 #endif // SK_ANGLE
619 #if SK_COMMAND_BUFFER 619 #if SK_COMMAND_BUFFER
620 case kCommandBuffer_BackEndType: 620 case kCommandBufferES2_BackEndType:
621 result = attachCommandBuffer(msaaSampleCount, info); 621 result = attachCommandBuffer(msaaSampleCount, info);
622 break; 622 break;
623 #endif // SK_COMMAND_BUFFER 623 #endif // SK_COMMAND_BUFFER
624 #endif // SK_SUPPORT_GPU 624 #endif // SK_SUPPORT_GPU
625 default: 625 default:
626 SkASSERT(false); 626 SkASSERT(false);
627 result = false; 627 result = false;
628 break; 628 break;
629 } 629 }
630 630
(...skipping 12 matching lines...) Expand all
643 #if SK_SUPPORT_GPU 643 #if SK_SUPPORT_GPU
644 case kNativeGL_BackEndType: 644 case kNativeGL_BackEndType:
645 detachGL(); 645 detachGL();
646 break; 646 break;
647 #if SK_ANGLE 647 #if SK_ANGLE
648 case kANGLE_BackEndType: 648 case kANGLE_BackEndType:
649 detachANGLE(); 649 detachANGLE();
650 break; 650 break;
651 #endif // SK_ANGLE 651 #endif // SK_ANGLE
652 #if SK_COMMAND_BUFFER 652 #if SK_COMMAND_BUFFER
653 case kCommandBuffer_BackEndType: 653 case kCommandBufferES2_BackEndType:
654 detachCommandBuffer(); 654 detachCommandBuffer();
655 break; 655 break;
656 #endif // SK_COMMAND_BUFFER 656 #endif // SK_COMMAND_BUFFER
657 #endif // SK_SUPPORT_GPU 657 #endif // SK_SUPPORT_GPU
658 default: 658 default:
659 SkASSERT(false); 659 SkASSERT(false);
660 break; 660 break;
661 } 661 }
662 fAttached = kNone_BackEndType; 662 fAttached = kNone_BackEndType;
663 } 663 }
664 664
665 void SkOSWindow::present() { 665 void SkOSWindow::present() {
666 switch (fAttached) { 666 switch (fAttached) {
667 case kNone_BackEndType: 667 case kNone_BackEndType:
668 // nothing to do 668 // nothing to do
669 return; 669 return;
670 #if SK_SUPPORT_GPU 670 #if SK_SUPPORT_GPU
671 case kNativeGL_BackEndType: 671 case kNativeGL_BackEndType:
672 presentGL(); 672 presentGL();
673 break; 673 break;
674 #if SK_ANGLE 674 #if SK_ANGLE
675 case kANGLE_BackEndType: 675 case kANGLE_BackEndType:
676 presentANGLE(); 676 presentANGLE();
677 break; 677 break;
678 #endif // SK_ANGLE 678 #endif // SK_ANGLE
679 #if SK_COMMAND_BUFFER 679 #if SK_COMMAND_BUFFER
680 case kCommandBuffer_BackEndType: 680 case kCommandBufferES2_BackEndType:
681 presentCommandBuffer(); 681 presentCommandBuffer();
682 break; 682 break;
683 #endif // SK_COMMAND_BUFFER 683 #endif // SK_COMMAND_BUFFER
684 #endif // SK_SUPPORT_GPU 684 #endif // SK_SUPPORT_GPU
685 default: 685 default:
686 SkASSERT(false); 686 SkASSERT(false);
687 break; 687 break;
688 } 688 }
689 } 689 }
690 690
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
770 } 770 }
771 771
772 void SkOSWindow::closeWindow() { 772 void SkOSWindow::closeWindow() {
773 DestroyWindow((HWND)fHWND); 773 DestroyWindow((HWND)fHWND);
774 if (fFullscreen) { 774 if (fFullscreen) {
775 DestroyWindow((HWND)fSavedWindowState.fHWND); 775 DestroyWindow((HWND)fSavedWindowState.fHWND);
776 } 776 }
777 gHwndToOSWindowMap.remove(fHWND); 777 gHwndToOSWindowMap.remove(fHWND);
778 } 778 }
779 #endif 779 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698