d90777ada3
This reverts commit 832c817bc8
.
Reason for revert: uninitialized value in GrBackendTexture
Original change's description:
> Remove GrBackendFormat's textureType use from isFormatTexturable call.
>
> The goal of this change was to remove the use of GrBackendFormat::textureType()
> from GrCaps::isFormatTexturable call. Instead we will always pass in a
> GrTextureType into this call.
>
> To do this a lot of plumbing of GrTextureType was added to various call
> sites. However, this CL halts the plubming up at the proxy level where we
> get it from the GrBackendFormat still. Future CLs will continue removing
> these call sites and others that use GrBackendFormat::textureType().
>
> Bug: skia:12342
> Change-Id: Ic0f02b9c7f7402405623b8aa31aa32a9a7c22297
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/439277
> Commit-Queue: Greg Daniel <egdaniel@google.com>
> Reviewed-by: Brian Salomon <bsalomon@google.com>
TBR=egdaniel@google.com,bsalomon@google.com,skcq-be@skia-corp.google.com.iam.gserviceaccount.com
Change-Id: I354bbbf00be7a86c480009f3e7b36a8777a6bf3a
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:12342
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/439338
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>
161 lines
6.3 KiB
C++
161 lines
6.3 KiB
C++
/*
|
|
* Copyright 2019 Google Inc.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
* found in the LICENSE file.
|
|
*/
|
|
|
|
#include "include/core/SkSurface.h"
|
|
#include "include/gpu/GrDirectContext.h"
|
|
#include "src/gpu/GrDirectContextPriv.h"
|
|
#include "src/gpu/gl/GrGLDefines.h"
|
|
#include "src/gpu/gl/GrGLGpu.h"
|
|
#include "src/gpu/gl/GrGLUtil.h"
|
|
#include "tests/Test.h"
|
|
|
|
#ifdef SK_GL
|
|
|
|
DEF_GPUTEST_FOR_GL_RENDERING_CONTEXTS(TextureBindingsResetTest, reporter, ctxInfo) {
|
|
#define GL(F) GR_GL_CALL(ctxInfo.glContext()->gl(), F)
|
|
|
|
auto dContext = ctxInfo.directContext();
|
|
GrGpu* gpu = dContext->priv().getGpu();
|
|
GrGLGpu* glGpu = static_cast<GrGLGpu*>(dContext->priv().getGpu());
|
|
|
|
struct Target {
|
|
GrGLenum fName;
|
|
GrGLenum fQuery;
|
|
};
|
|
SkTDArray<Target> targets;
|
|
targets.push_back({GR_GL_TEXTURE_2D, GR_GL_TEXTURE_BINDING_2D});
|
|
bool supportExternal;
|
|
if ((supportExternal = glGpu->glCaps().shaderCaps()->externalTextureSupport())) {
|
|
targets.push_back({GR_GL_TEXTURE_EXTERNAL, GR_GL_TEXTURE_BINDING_EXTERNAL});
|
|
}
|
|
bool supportRectangle;
|
|
if ((supportRectangle = glGpu->glCaps().rectangleTextureSupport())) {
|
|
targets.push_back({GR_GL_TEXTURE_RECTANGLE, GR_GL_TEXTURE_BINDING_RECTANGLE});
|
|
}
|
|
GrGLint numUnits;
|
|
GL(GetIntegerv(GR_GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS, &numUnits));
|
|
SkTDArray<GrGLuint> claimedIDs;
|
|
claimedIDs.setCount(numUnits * targets.count());
|
|
GL(GenTextures(claimedIDs.count(), claimedIDs.begin()));
|
|
|
|
auto resetBindings = [&] {
|
|
int i = 0;
|
|
for (int u = 0; u < numUnits; ++u) {
|
|
GL(ActiveTexture(GR_GL_TEXTURE0 + u));
|
|
for (auto target : targets) {
|
|
GL(BindTexture(target.fName, claimedIDs[i++]));
|
|
}
|
|
}
|
|
};
|
|
auto checkBindings = [&] {
|
|
int i = 0;
|
|
for (int u = 0; u < numUnits; ++u) {
|
|
GL(ActiveTexture(GR_GL_TEXTURE0 + u));
|
|
for (auto target : targets) {
|
|
GrGLuint boundID = ~0;
|
|
GL(GetIntegerv(target.fQuery, reinterpret_cast<GrGLint*>(&boundID)));
|
|
if (boundID != claimedIDs[i] && boundID != 0) {
|
|
ERRORF(reporter, "Unit %d, target 0x%04x has ID %d bound. Expected %d or 0.", u,
|
|
target.fName, boundID, claimedIDs[i]);
|
|
return;
|
|
}
|
|
++i;
|
|
}
|
|
}
|
|
};
|
|
|
|
// Initialize texture unit/target combo bindings to 0.
|
|
dContext->flushAndSubmit();
|
|
resetBindings();
|
|
dContext->resetContext();
|
|
|
|
// Test creating a texture and then resetting bindings.
|
|
static constexpr SkISize kDims = {10, 10};
|
|
GrBackendFormat format = gpu->caps()->getDefaultBackendFormat(GrColorType::kRGBA_8888,
|
|
GrRenderable::kNo);
|
|
auto tex = gpu->createTexture(kDims, format, GrRenderable::kNo, 1, GrMipmapped::kNo,
|
|
SkBudgeted::kNo, GrProtected::kNo);
|
|
REPORTER_ASSERT(reporter, tex);
|
|
dContext->resetGLTextureBindings();
|
|
checkBindings();
|
|
resetBindings();
|
|
dContext->resetContext();
|
|
|
|
// Test drawing and then resetting bindings. This should force a MIP regeneration if MIP
|
|
// maps are supported as well.
|
|
auto info = SkImageInfo::Make(10, 10, kRGBA_8888_SkColorType, kPremul_SkAlphaType);
|
|
auto surf = SkSurface::MakeRenderTarget(dContext, SkBudgeted::kYes, info, 1, nullptr);
|
|
surf->getCanvas()->clear(0x80FF0000);
|
|
auto img = surf->makeImageSnapshot();
|
|
surf->getCanvas()->clear(SK_ColorBLUE);
|
|
surf->getCanvas()->save();
|
|
surf->getCanvas()->scale(0.25, 0.25);
|
|
surf->getCanvas()->drawImage(img.get(), 0, 0, SkSamplingOptions({1.0f/3, 1.0f/3}), nullptr);
|
|
surf->getCanvas()->restore();
|
|
surf->flushAndSubmit();
|
|
dContext->resetGLTextureBindings();
|
|
checkBindings();
|
|
resetBindings();
|
|
dContext->resetContext();
|
|
|
|
if (supportExternal) {
|
|
GrBackendTexture texture2D = dContext->createBackendTexture(
|
|
10, 10, kRGBA_8888_SkColorType,
|
|
SkColors::kTransparent, GrMipmapped::kNo, GrRenderable::kNo, GrProtected::kNo);
|
|
GrGLTextureInfo info2D;
|
|
REPORTER_ASSERT(reporter, texture2D.getGLTextureInfo(&info2D));
|
|
GrEGLImage eglImage = ctxInfo.glContext()->texture2DToEGLImage(info2D.fID);
|
|
REPORTER_ASSERT(reporter, eglImage);
|
|
GrGLTextureInfo infoExternal;
|
|
infoExternal.fID = ctxInfo.glContext()->eglImageToExternalTexture(eglImage);
|
|
infoExternal.fTarget = GR_GL_TEXTURE_EXTERNAL;
|
|
infoExternal.fFormat = info2D.fFormat;
|
|
REPORTER_ASSERT(reporter, infoExternal.fID);
|
|
GrBackendTexture backendTexture(10, 10, GrMipmapped::kNo, infoExternal);
|
|
// Above texture creation will have messed with GL state and bindings.
|
|
resetBindings();
|
|
dContext->resetContext();
|
|
img = SkImage::MakeFromTexture(dContext, backendTexture, kTopLeft_GrSurfaceOrigin,
|
|
kRGBA_8888_SkColorType, kPremul_SkAlphaType, nullptr);
|
|
REPORTER_ASSERT(reporter, img);
|
|
surf->getCanvas()->drawImage(img, 0, 0);
|
|
img.reset();
|
|
surf->flushAndSubmit();
|
|
dContext->resetGLTextureBindings();
|
|
checkBindings();
|
|
resetBindings();
|
|
GL(DeleteTextures(1, &infoExternal.fID));
|
|
ctxInfo.glContext()->destroyEGLImage(eglImage);
|
|
dContext->deleteBackendTexture(texture2D);
|
|
dContext->resetContext();
|
|
}
|
|
|
|
if (supportRectangle) {
|
|
format = GrBackendFormat::MakeGL(GR_GL_RGBA8, GR_GL_TEXTURE_RECTANGLE);
|
|
GrBackendTexture rectangleTexture =
|
|
dContext->createBackendTexture(10, 10, format, GrMipmapped::kNo, GrRenderable::kNo);
|
|
if (rectangleTexture.isValid()) {
|
|
img = SkImage::MakeFromTexture(dContext, rectangleTexture, kTopLeft_GrSurfaceOrigin,
|
|
kRGBA_8888_SkColorType, kPremul_SkAlphaType, nullptr);
|
|
REPORTER_ASSERT(reporter, img);
|
|
surf->getCanvas()->drawImage(img, 0, 0);
|
|
img.reset();
|
|
surf->flushAndSubmit();
|
|
dContext->resetGLTextureBindings();
|
|
checkBindings();
|
|
resetBindings();
|
|
dContext->deleteBackendTexture(rectangleTexture);
|
|
}
|
|
}
|
|
|
|
GL(DeleteTextures(claimedIDs.count(), claimedIDs.begin()));
|
|
|
|
#undef GL
|
|
}
|
|
|
|
#endif // SK_GL
|