OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright 2012 Google Inc. | 2 * Copyright 2012 Google Inc. |
3 * | 3 * |
4 * Use of this source code is governed by a BSD-style license that can be | 4 * Use of this source code is governed by a BSD-style license that can be |
5 * found in the LICENSE file. | 5 * found in the LICENSE file. |
6 */ | 6 */ |
7 | 7 |
8 #include "../src/image/SkImagePriv.h" | 8 #include "../src/image/SkImagePriv.h" |
9 #include "../src/image/SkSurface_Base.h" | 9 #include "../src/image/SkSurface_Base.h" |
10 #include "SkBitmap.h" | 10 #include "SkBitmap.h" |
(...skipping 674 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
685 return useGpu ? surface->getCanvas()->getDevice()->accessBitmap(false).getTe xture() : | 685 return useGpu ? surface->getCanvas()->getDevice()->accessBitmap(false).getTe xture() : |
686 surface->getCanvas()->getDevice()->accessBitmap(false).getPixels(); | 686 surface->getCanvas()->getDevice()->accessBitmap(false).getPixels(); |
687 } | 687 } |
688 | 688 |
689 static void TestDeferredCanvasSurface(skiatest::Reporter* reporter, GrContextFac tory* factory) { | 689 static void TestDeferredCanvasSurface(skiatest::Reporter* reporter, GrContextFac tory* factory) { |
690 SkImageInfo imageSpec = SkImageInfo::MakeN32Premul(10, 10); | 690 SkImageInfo imageSpec = SkImageInfo::MakeN32Premul(10, 10); |
691 SkSurface* surface; | 691 SkSurface* surface; |
692 bool useGpu = NULL != factory; | 692 bool useGpu = NULL != factory; |
693 #if SK_SUPPORT_GPU | 693 #if SK_SUPPORT_GPU |
694 if (useGpu) { | 694 if (useGpu) { |
695 GrContext* context = factory->get(GrContextFactory::kNative_GLContextTyp e); | 695 GrContext* context = factory->get(GrContextFactory::kNative_GLContextTyp e, |
696 kNone_GrGLStandard); | |
696 if (NULL == context) { | 697 if (NULL == context) { |
697 return; | 698 return; |
698 } | 699 } |
699 | 700 |
700 surface = SkSurface::NewRenderTarget(context, imageSpec); | 701 surface = SkSurface::NewRenderTarget(context, imageSpec); |
701 } else { | 702 } else { |
702 surface = SkSurface::NewRaster(imageSpec); | 703 surface = SkSurface::NewRaster(imageSpec); |
703 } | 704 } |
704 #else | 705 #else |
705 SkASSERT(!useGpu); | 706 SkASSERT(!useGpu); |
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
751 PixelPtr pixels5 = getSurfacePixelPtr(surface, useGpu); | 752 PixelPtr pixels5 = getSurfacePixelPtr(surface, useGpu); |
752 REPORTER_ASSERT(reporter, pixels4 == pixels5); | 753 REPORTER_ASSERT(reporter, pixels4 == pixels5); |
753 } | 754 } |
754 | 755 |
755 static void TestDeferredCanvasSetSurface(skiatest::Reporter* reporter, GrContext Factory* factory) { | 756 static void TestDeferredCanvasSetSurface(skiatest::Reporter* reporter, GrContext Factory* factory) { |
756 SkImageInfo imageSpec = SkImageInfo::MakeN32Premul(10, 10); | 757 SkImageInfo imageSpec = SkImageInfo::MakeN32Premul(10, 10); |
757 SkSurface* surface; | 758 SkSurface* surface; |
758 SkSurface* alternateSurface; | 759 SkSurface* alternateSurface; |
759 bool useGpu = NULL != factory; | 760 bool useGpu = NULL != factory; |
760 #if SK_SUPPORT_GPU | 761 #if SK_SUPPORT_GPU |
761 if (useGpu) { | 762 if (useGpu) { |
robertphillips
2014/06/09 14:31:05
nit: overlength
Kimmo Kinnunen
2014/06/16 12:36:40
Done. (reverted)
| |
762 GrContext* context = factory->get(GrContextFactory::kNative_GLContextTyp e); | 763 GrContext* context = factory->get(GrContextFactory::kNative_GLContextTyp e, kNone_GrGLStandard); |
763 if (NULL == context) { | 764 if (NULL == context) { |
764 return; | 765 return; |
765 } | 766 } |
766 surface = SkSurface::NewRenderTarget(context, imageSpec); | 767 surface = SkSurface::NewRenderTarget(context, imageSpec); |
767 alternateSurface = SkSurface::NewRenderTarget(context, imageSpec); | 768 alternateSurface = SkSurface::NewRenderTarget(context, imageSpec); |
768 } else { | 769 } else { |
769 surface = SkSurface::NewRaster(imageSpec); | 770 surface = SkSurface::NewRaster(imageSpec); |
770 alternateSurface = SkSurface::NewRaster(imageSpec); | 771 alternateSurface = SkSurface::NewRaster(imageSpec); |
771 } | 772 } |
772 #else | 773 #else |
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
831 TestDeferredCanvasSurface(reporter, NULL); | 832 TestDeferredCanvasSurface(reporter, NULL); |
832 TestDeferredCanvasSetSurface(reporter, NULL); | 833 TestDeferredCanvasSetSurface(reporter, NULL); |
833 } | 834 } |
834 | 835 |
835 DEF_GPUTEST(DeferredCanvas_GPU, reporter, factory) { | 836 DEF_GPUTEST(DeferredCanvas_GPU, reporter, factory) { |
836 if (factory != NULL) { | 837 if (factory != NULL) { |
837 TestDeferredCanvasSurface(reporter, factory); | 838 TestDeferredCanvasSurface(reporter, factory); |
838 TestDeferredCanvasSetSurface(reporter, factory); | 839 TestDeferredCanvasSetSurface(reporter, factory); |
839 } | 840 } |
840 } | 841 } |
OLD | NEW |