| OLD | NEW |
| 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 600 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 611 #if SK_SUPPORT_GPU | 611 #if SK_SUPPORT_GPU |
| 612 case kNativeGL_BackEndType: | 612 case kNativeGL_BackEndType: |
| 613 result = attachGL(msaaSampleCount, info); | 613 result = attachGL(msaaSampleCount, info); |
| 614 break; | 614 break; |
| 615 #if SK_ANGLE | 615 #if SK_ANGLE |
| 616 case kANGLE_BackEndType: | 616 case kANGLE_BackEndType: |
| 617 result = attachANGLE(msaaSampleCount, info); | 617 result = attachANGLE(msaaSampleCount, info); |
| 618 break; | 618 break; |
| 619 #endif // SK_ANGLE | 619 #endif // SK_ANGLE |
| 620 #if SK_COMMAND_BUFFER | 620 #if SK_COMMAND_BUFFER |
| 621 case kCommandBuffer_BackEndType: | 621 case kCommandBufferES2_BackEndType: |
| 622 result = attachCommandBuffer(msaaSampleCount, info); | 622 result = attachCommandBuffer(msaaSampleCount, info); |
| 623 break; | 623 break; |
| 624 #endif // SK_COMMAND_BUFFER | 624 #endif // SK_COMMAND_BUFFER |
| 625 #endif // SK_SUPPORT_GPU | 625 #endif // SK_SUPPORT_GPU |
| 626 default: | 626 default: |
| 627 SkASSERT(false); | 627 SkASSERT(false); |
| 628 result = false; | 628 result = false; |
| 629 break; | 629 break; |
| 630 } | 630 } |
| 631 | 631 |
| (...skipping 12 matching lines...) Expand all Loading... |
| 644 #if SK_SUPPORT_GPU | 644 #if SK_SUPPORT_GPU |
| 645 case kNativeGL_BackEndType: | 645 case kNativeGL_BackEndType: |
| 646 detachGL(); | 646 detachGL(); |
| 647 break; | 647 break; |
| 648 #if SK_ANGLE | 648 #if SK_ANGLE |
| 649 case kANGLE_BackEndType: | 649 case kANGLE_BackEndType: |
| 650 detachANGLE(); | 650 detachANGLE(); |
| 651 break; | 651 break; |
| 652 #endif // SK_ANGLE | 652 #endif // SK_ANGLE |
| 653 #if SK_COMMAND_BUFFER | 653 #if SK_COMMAND_BUFFER |
| 654 case kCommandBuffer_BackEndType: | 654 case kCommandBufferES2_BackEndType: |
| 655 detachCommandBuffer(); | 655 detachCommandBuffer(); |
| 656 break; | 656 break; |
| 657 #endif // SK_COMMAND_BUFFER | 657 #endif // SK_COMMAND_BUFFER |
| 658 #endif // SK_SUPPORT_GPU | 658 #endif // SK_SUPPORT_GPU |
| 659 default: | 659 default: |
| 660 SkASSERT(false); | 660 SkASSERT(false); |
| 661 break; | 661 break; |
| 662 } | 662 } |
| 663 fAttached = kNone_BackEndType; | 663 fAttached = kNone_BackEndType; |
| 664 } | 664 } |
| 665 | 665 |
| 666 void SkOSWindow::present() { | 666 void SkOSWindow::present() { |
| 667 switch (fAttached) { | 667 switch (fAttached) { |
| 668 case kNone_BackEndType: | 668 case kNone_BackEndType: |
| 669 // nothing to do | 669 // nothing to do |
| 670 return; | 670 return; |
| 671 #if SK_SUPPORT_GPU | 671 #if SK_SUPPORT_GPU |
| 672 case kNativeGL_BackEndType: | 672 case kNativeGL_BackEndType: |
| 673 presentGL(); | 673 presentGL(); |
| 674 break; | 674 break; |
| 675 #if SK_ANGLE | 675 #if SK_ANGLE |
| 676 case kANGLE_BackEndType: | 676 case kANGLE_BackEndType: |
| 677 presentANGLE(); | 677 presentANGLE(); |
| 678 break; | 678 break; |
| 679 #endif // SK_ANGLE | 679 #endif // SK_ANGLE |
| 680 #if SK_COMMAND_BUFFER | 680 #if SK_COMMAND_BUFFER |
| 681 case kCommandBuffer_BackEndType: | 681 case kCommandBufferES2_BackEndType: |
| 682 presentCommandBuffer(); | 682 presentCommandBuffer(); |
| 683 break; | 683 break; |
| 684 #endif // SK_COMMAND_BUFFER | 684 #endif // SK_COMMAND_BUFFER |
| 685 #endif // SK_SUPPORT_GPU | 685 #endif // SK_SUPPORT_GPU |
| 686 default: | 686 default: |
| 687 SkASSERT(false); | 687 SkASSERT(false); |
| 688 break; | 688 break; |
| 689 } | 689 } |
| 690 } | 690 } |
| 691 | 691 |
| (...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 771 } | 771 } |
| 772 | 772 |
| 773 void SkOSWindow::closeWindow() { | 773 void SkOSWindow::closeWindow() { |
| 774 DestroyWindow((HWND)fHWND); | 774 DestroyWindow((HWND)fHWND); |
| 775 if (fFullscreen) { | 775 if (fFullscreen) { |
| 776 DestroyWindow((HWND)fSavedWindowState.fHWND); | 776 DestroyWindow((HWND)fSavedWindowState.fHWND); |
| 777 } | 777 } |
| 778 gHwndToOSWindowMap.remove(fHWND); | 778 gHwndToOSWindowMap.remove(fHWND); |
| 779 } | 779 } |
| 780 #endif | 780 #endif |
| OLD | NEW |