aboutsummaryrefslogtreecommitdiffhomepage
path: root/tests
diff options
context:
space:
mode:
authorGravatar bsalomon <bsalomon@google.com>2016-02-05 17:56:39 -0800
committerGravatar Commit bot <commit-bot@chromium.org>2016-02-05 17:56:39 -0800
commitf1036b2c6610e106b299a1e2b69b814ff18b60f5 (patch)
tree47b85852c316af34a60f46665ab6fc7a27d40b51 /tests
parent3a2caf8ecf38124f4ad21a0f6c4dabfcfa17911a (diff)
Revert of skia: Add support for CHROMIUM_image backed textures. (patchset #17 id:340001 of https://codereview.chromium.org/1623653002/ )
Reason for revert: New unit test is failing on Windows ANGLE bots: http://build.chromium.org/p/client.skia/builders/Test-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-ANGLE/builds/1866/steps/dm/logs/stdio Original issue's description: > skia: Add support for CHROMIUM_image backed textures. > > I created a new abstract base class TextureStorageAllocator that consumers of > Skia can subclass and pass back to Skia. When a surface is created with a > pointer to a TextureStorageAllocator, any textures it creates, or that are > derived from the original surface, will allocate and deallocate storage using > the methods on TextureStorageAllocator. > > BUG=https://code.google.com/p/chromium/issues/detail?id=579664 > GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1623653002 > > Committed: https://skia.googlesource.com/skia/+/92098e691f10a010e7421125ba4d44c02506bb55 > > Committed: https://skia.googlesource.com/skia/+/7fec91ce6660190f8d7c5eb6f3061e4550cc672b TBR=bsalomon@chromium.org,cblume@chromium.org,robertphillips@google.com,egdaniel@google.com,reed@google.com,erikchen@chromium.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=https://code.google.com/p/chromium/issues/detail?id=579664 Review URL: https://codereview.chromium.org/1673923003
Diffstat (limited to 'tests')
-rw-r--r--tests/TextureStorageAllocator.cpp104
1 files changed, 0 insertions, 104 deletions
diff --git a/tests/TextureStorageAllocator.cpp b/tests/TextureStorageAllocator.cpp
deleted file mode 100644
index 958b76c1af..0000000000
--- a/tests/TextureStorageAllocator.cpp
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Copyright 2016 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "Test.h"
-#if SK_SUPPORT_GPU
-#include "gl/GrGLGpu.h"
-#include "GrContext.h"
-#include "SkSurface_Gpu.h"
-#include "../include/gpu/gl/SkGLContext.h"
-#include "../include/gpu/GrTypes.h"
-#include "../include/private/SkTemplates.h"
-
-class TestStorageAllocator {
- public:
- static GrTextureStorageAllocator::Result allocateTextureStorage(void* ctx,
- GrBackendObject texture, unsigned width, unsigned height, GrPixelConfig config,
- const void* srcData, GrSurfaceOrigin) {
- TestStorageAllocator* allocator = static_cast<TestStorageAllocator*>(ctx);
- if (!allocator->m_allowAllocation)
- return GrTextureStorageAllocator::Result::kFailed;
- SkAutoTMalloc<uint8_t> pixels(width * height * 4);
- memset(pixels.get(), 0, width * height * 4);
-
- GrGLuint id;
- GrGLenum target = GR_GL_TEXTURE_2D;
- GR_GL_CALL(allocator->m_gl, GenTextures(1, &id));
- GR_GL_CALL(allocator->m_gl, BindTexture(target, id));
- GR_GL_CALL(allocator->m_gl, TexImage2D(target, 0, GR_GL_RGBA, width, height, 0, GR_GL_RGBA,
- GR_GL_UNSIGNED_BYTE, pixels.get()));
- GrGLTextureInfo* info = reinterpret_cast<GrGLTextureInfo*>(texture);
- info->fID = id;
- info->fTarget = target;
- allocator->m_mostRecentlyAllocatedStorage = id;
- return GrTextureStorageAllocator::Result::kSucceededWithoutUpload;
- }
- static void deallocateTextureStorage(void* ctx, GrBackendObject texture) {
- TestStorageAllocator* allocator = static_cast<TestStorageAllocator*>(ctx);
- GrGLTextureInfo* info = reinterpret_cast<GrGLTextureInfo*>(texture);
- GR_GL_CALL(allocator->m_gl, DeleteTextures(1, &(info->fID)));
- }
-
- GrGLuint m_mostRecentlyAllocatedStorage;
- const GrGLInterface* m_gl;
- bool m_allowAllocation;
-};
-
-DEF_GPUTEST_FOR_RENDERING_CONTEXTS(CustomTexture, reporter, context, glContext) {
- static const int kWidth = 13;
- static const int kHeight = 13;
-
- const GrGLInterface* gl = glContext->gl();
- TestStorageAllocator allocator;
- allocator.m_allowAllocation = true;
- allocator.m_gl = gl;
- GrTextureStorageAllocator grAllocator;
- grAllocator.fAllocateTextureStorage = &TestStorageAllocator::allocateTextureStorage;
- grAllocator.fDeallocateTextureStorage= &TestStorageAllocator::deallocateTextureStorage;
- grAllocator.fCtx = &allocator;
-
- SkSurface* surface = SkSurface_Gpu::NewRenderTarget(
- context, SkSurface_Gpu::kNo_Budgeted, SkImageInfo::MakeN32Premul(kWidth, kHeight), 0,
- NULL, grAllocator);
- REPORTER_ASSERT(reporter, surface);
- GrGLuint id = allocator.m_mostRecentlyAllocatedStorage;
-
- SkImage* image = surface->newImageSnapshot();
- REPORTER_ASSERT(reporter, image->isTextureBacked());
- SkImageInfo imageInfo = SkImageInfo::MakeN32Premul(1,1);
- GrColor dest = 0x11223344;
- REPORTER_ASSERT(reporter, image->readPixels(imageInfo, &dest, 4 * kWidth, 0, 0));
- REPORTER_ASSERT(reporter, GrColorUnpackG(dest) == 0);
-
- surface->getCanvas()->clear(SK_ColorGREEN);
- SkImage* image2 = surface->newImageSnapshot();
- REPORTER_ASSERT(reporter, image2->isTextureBacked());
- REPORTER_ASSERT(reporter, allocator.m_mostRecentlyAllocatedStorage != id);
-
- REPORTER_ASSERT(reporter, image2->readPixels(imageInfo, &dest, 4 * kWidth, 0, 0));
- REPORTER_ASSERT(reporter, GrColorUnpackG(dest) == 255);
-}
-
-DEF_GPUTEST_FOR_RENDERING_CONTEXTS(CustomTextureFailure, reporter, context, glContext) {
- static const int kWidth = 13;
- static const int kHeight = 13;
-
- const GrGLInterface* gl = glContext->gl();
- TestStorageAllocator allocator;
- allocator.m_allowAllocation = false;
- allocator.m_gl = gl;
- GrTextureStorageAllocator grAllocator;
- grAllocator.fAllocateTextureStorage = &TestStorageAllocator::allocateTextureStorage;
- grAllocator.fDeallocateTextureStorage= &TestStorageAllocator::deallocateTextureStorage;
- grAllocator.fCtx = &allocator;
- SkSurface* surface = SkSurface_Gpu::NewRenderTarget(
- context, SkSurface_Gpu::kNo_Budgeted, SkImageInfo::MakeN32Premul(kWidth, kHeight), 0,
- NULL, grAllocator);
- REPORTER_ASSERT(reporter, !surface);
-}
-
-#endif