AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add "meshCount" to GrProgramInfo

Browse Source 
This improves the encapsulation of the GrProgramInfo class.

Bug: skia:9455
Change-Id: Ic241ba4a2c2edea3e774522065371e5ed8cc2da3
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/247438
Commit-Queue: Robert Phillips <robertphillips@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>
This commit is contained in:
Robert Phillips 2019-10-10 12:50:22 -04:00 committed by Skia Commit-Bot
parent b484e7ce24
commit 2d8a95ee71
15 changed files with 60 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gm/clockwise.cpp
View File

@ -173,7 +173,7 @@ private:
flushState->drawOpArgs().origin(),
pipeline,
primProc,
nullptr, nullptr);
nullptr, nullptr, 0);
flushState->opsRenderPass()->draw(programInfo, &mesh, 1, SkRect::MakeXYWH(0, fY, 100, 100));
}

2
gm/fwidth_squircle.cpp
View File

@ -180,7 +180,7 @@ private:
flushState->drawOpArgs().origin(),
pipeline,
primProc,
nullptr, nullptr);
nullptr, nullptr, 0);
GrMesh mesh(GrPrimitiveType::kTriangleStrip);
mesh.setNonIndexedNonInstanced(4);

2
gm/samplelocations.cpp
View File

@ -241,7 +241,7 @@ private:
flushState->drawOpArgs().origin(),
pipeline,
primProc,
nullptr, nullptr);
nullptr, nullptr, 0);
GrMesh mesh(GrPrimitiveType::kTriangleStrip);
mesh.setInstanced(nullptr, 200*200, 0, 4);

3
src/gpu/GrOpFlushState.cpp
View File

@ -59,7 +59,8 @@ void GrOpFlushState::executeDrawsAndUploadsForMeshDrawOp(
*pipeline,
*fCurrDraw->fGeometryProcessor,
fCurrDraw->fFixedDynamicState,
fCurrDraw->fDynamicStateArrays);
fCurrDraw->fDynamicStateArrays,
fCurrDraw->fMeshCnt);
this->opsRenderPass()->draw(programInfo, fCurrDraw->fMeshes,
fCurrDraw->fMeshCnt, chainBounds);

10
src/gpu/GrOpsRenderPass.cpp
View File

@ -45,13 +45,9 @@ bool GrOpsRenderPass::draw(const GrProgramInfo& programInfo,
SkASSERT(!programInfo.primProc().hasInstanceAttributes() ||
this->gpu()->caps()->instanceAttribSupport());
for (int i = 0; i < meshCount; ++i) {
SkASSERT(programInfo.primProc().hasVertexAttributes() == meshes[i].hasVertexData());
SkASSERT(programInfo.primProc().hasInstanceAttributes() == meshes[i].hasInstanceData());
}
programInfo.checkAllInstantiated(meshCount);
programInfo.checkMSAAAndMIPSAreResolved(meshCount);
programInfo.compatibleWithMeshes(meshes, meshCount);
programInfo.checkAllInstantiated();
programInfo.checkMSAAAndMIPSAreResolved();
#endif
if (programInfo.primProc().numVertexAttributes() > this->gpu()->caps()->maxVertexAttributes()) {

51
src/gpu/GrProgramInfo.cpp
View File

@ -9,6 +9,7 @@
#ifdef SK_DEBUG
#include "src/gpu/GrMesh.h"
#include "src/gpu/GrTexturePriv.h"
void GrProgramInfo::validate() const {
@ -25,25 +26,8 @@ void GrProgramInfo::validate() const {
SkASSERT(!fPipeline.isScissorEnabled() || this->hasFixedScissor() ||
this->hasDynamicScissors());
}
void GrProgramInfo::checkAllInstantiated(int meshCount) const {
if (this->hasFixedPrimProcTextures()) {
auto fixedPrimProcTextures = this->fixedPrimProcTextures();
for (int s = 0; s < this->primProc().numTextureSamplers(); ++s) {
SkASSERT(fixedPrimProcTextures[s]->isInstantiated());
}
}
if (this->hasDynamicPrimProcTextures()) {
for (int m = 0; m < meshCount; ++m) {
auto dynamicPrimProcTextures = this->dynamicPrimProcTextures(m);
for (int s = 0; s < this->primProc().numTextureSamplers(); ++s) {
SkASSERT(dynamicPrimProcTextures[s]->isInstantiated());
}
}
// TODO: if GrProgramInfo had the mesh count we could do this in validate!
// Check that, for a given sampler, the properties of the dynamic textures remain
// the same for all the meshes
for (int s = 0; s < this->primProc().numTextureSamplers(); ++s) {
@ -53,7 +37,7 @@ void GrProgramInfo::checkAllInstantiated(int meshCount) const {
GrTextureType type = dynamicPrimProcTextures[s]->textureType();
GrPixelConfig config = dynamicPrimProcTextures[s]->config();
for (int m = 1; m < meshCount; ++m) {
for (int m = 1; m < fNumDynamicStateArrays; ++m) {
dynamicPrimProcTextures = this->dynamicPrimProcTextures(m);
auto testProxy = dynamicPrimProcTextures[s];
@ -65,7 +49,25 @@ void GrProgramInfo::checkAllInstantiated(int meshCount) const {
}
}
void GrProgramInfo::checkMSAAAndMIPSAreResolved(int meshCount) const {
void GrProgramInfo::checkAllInstantiated() const {
if (this->hasFixedPrimProcTextures()) {
auto fixedPrimProcTextures = this->fixedPrimProcTextures();
for (int s = 0; s < this->primProc().numTextureSamplers(); ++s) {
SkASSERT(fixedPrimProcTextures[s]->isInstantiated());
}
}
if (this->hasDynamicPrimProcTextures()) {
for (int m = 0; m < fNumDynamicStateArrays; ++m) {
auto dynamicPrimProcTextures = this->dynamicPrimProcTextures(m);
for (int s = 0; s < this->primProc().numTextureSamplers(); ++s) {
SkASSERT(dynamicPrimProcTextures[s]->isInstantiated());
}
}
}
}
void GrProgramInfo::checkMSAAAndMIPSAreResolved() const {
auto assertResolved = [](GrTexture* tex, const GrSamplerState& sampler) {
SkASSERT(tex);
@ -81,7 +83,7 @@ void GrProgramInfo::checkMSAAAndMIPSAreResolved(int meshCount) const {
};
if (this->hasDynamicPrimProcTextures()) {
for (int m = 0; m < meshCount; ++m) {
for (int m = 0; m < fNumDynamicStateArrays; ++m) {
auto dynamicPrimProcTextures = this->dynamicPrimProcTextures(m);
for (int s = 0; s < this->primProc().numTextureSamplers(); ++s) {
@ -107,4 +109,13 @@ void GrProgramInfo::checkMSAAAndMIPSAreResolved(int meshCount) const {
}
}
void GrProgramInfo::compatibleWithMeshes(const GrMesh meshes[], int meshCount) const {
SkASSERT(!fNumDynamicStateArrays || meshCount == fNumDynamicStateArrays);
for (int i = 0; i < meshCount; ++i) {
SkASSERT(fPrimProc.hasVertexAttributes() == meshes[i].hasVertexData());
SkASSERT(fPrimProc.hasInstanceAttributes() == meshes[i].hasInstanceData());
}
}
#endif

21
src/gpu/GrProgramInfo.h
View File

@ -12,29 +12,32 @@
#include "src/gpu/GrPipeline.h"
#include "src/gpu/GrPrimitiveProcessor.h"
class GrMesh;
class GrProgramInfo {
public:
// TODO: it seems like this object should also get the number of copies in
// dynamicStateArrays. If that were true a portion of checkAllInstantiated could be moved
// to validate.
GrProgramInfo(int numSamples,
GrSurfaceOrigin origin,
const GrPipeline& pipeline,
const GrPrimitiveProcessor& primProc,
const GrPipeline::FixedDynamicState* fixedDynamicState,
const GrPipeline::DynamicStateArrays* dynamicStateArrays)
const GrPipeline::DynamicStateArrays* dynamicStateArrays,
int numDynamicStateArrays)
: fNumSamples(numSamples)
, fOrigin(origin)
, fPipeline(pipeline)
, fPrimProc(primProc)
, fFixedDynamicState(fixedDynamicState)
, fDynamicStateArrays(dynamicStateArrays) {
, fDynamicStateArrays(dynamicStateArrays)
, fNumDynamicStateArrays(numDynamicStateArrays) {
fRequestedFeatures = fPrimProc.requestedFeatures();
for (int i = 0; i < fPipeline.numFragmentProcessors(); ++i) {
fRequestedFeatures |= fPipeline.getFragmentProcessor(i).requestedFeatures();
}
fRequestedFeatures |= fPipeline.getXferProcessor().requestedFeatures();
SkDEBUGCODE(this->validate();)
(void) fNumDynamicStateArrays; // touch this to quiet unused member warnings
}
GrProcessor::CustomFeatures requestedFeatures() const { return fRequestedFeatures; }
@ -44,7 +47,6 @@ public:
const GrPipeline& pipeline() const { return fPipeline; }
const GrPrimitiveProcessor& primProc() const { return fPrimProc; }
const GrPipeline::FixedDynamicState* fixedDynamicState() const { return fFixedDynamicState; }
const GrPipeline::DynamicStateArrays* dynamicStateArrays() const { return fDynamicStateArrays; }
// TODO: can this be removed?
const GrTextureProxy* const* primProcProxies() const {
@ -84,6 +86,7 @@ public:
const GrTextureProxy* const* dynamicPrimProcTextures(int i) const {
SkASSERT(this->hasDynamicPrimProcTextures());
SkASSERT(i < fNumDynamicStateArrays);
return fDynamicStateArrays->fPrimitiveProcessorTextures +
i * fPrimProc.numTextureSamplers();
@ -101,8 +104,9 @@ public:
#ifdef SK_DEBUG
void validate() const;
void checkAllInstantiated(int meshCount) const;
void checkMSAAAndMIPSAreResolved(int meshCount) const;
void checkAllInstantiated() const;
void checkMSAAAndMIPSAreResolved() const;
void compatibleWithMeshes(const GrMesh meshes[], int meshCount) const;
bool isNVPR() const {
return fPrimProc.isPathRendering() && !fPrimProc.willUseGeoShader() &&
@ -117,6 +121,7 @@ private:
const GrPrimitiveProcessor& fPrimProc;
const GrPipeline::FixedDynamicState* fFixedDynamicState;
const GrPipeline::DynamicStateArrays* fDynamicStateArrays;
const int fNumDynamicStateArrays;
GrProcessor::CustomFeatures fRequestedFeatures;
};

2
src/gpu/ccpr/GrCCCoverageProcessor.cpp
View File

@ -208,7 +208,7 @@ void GrCCCoverageProcessor::draw(
pipeline,
*this,
nullptr,
&dynamicStateArrays);
&dynamicStateArrays, 0);
renderPass->draw(programInfo, meshes, meshCount, drawBounds);

2
src/gpu/ccpr/GrCCPathProcessor.cpp
View File

@ -146,7 +146,7 @@ void GrCCPathProcessor::drawPaths(GrOpFlushState* flushState, const GrPipeline&
pipeline,
*this,
fixedDynamicState,
nullptr);
nullptr, 0);
flushState->opsRenderPass()->draw(programInfo, &mesh, 1, bounds);
}

2
src/gpu/ccpr/GrCCStroker.cpp
View File

@ -782,7 +782,7 @@ void GrCCStroker::flushBufferedMeshesAsStrokes(const GrPrimitiveProcessor& proce
pipeline,
processor,
nullptr,
&dynamicStateArrays);
&dynamicStateArrays, 0);
flushState->opsRenderPass()->draw(programInfo,
fMeshesBuffer.begin(), fMeshesBuffer.count(),

2
src/gpu/ccpr/GrStencilAtlasOp.cpp
View File

@ -156,7 +156,7 @@ void GrStencilAtlasOp::onExecute(GrOpFlushState* flushState, const SkRect& chain
resolvePipeline,
primProc,
&scissorRectState,
nullptr);
nullptr, 0);
flushState->opsRenderPass()->draw(programInfo, &mesh, 1, SkRect::Make(drawBoundsRect));
}

2
src/gpu/ops/GrDrawPathOp.cpp
View File

@ -98,7 +98,7 @@ void GrDrawPathOp::onExecute(GrOpFlushState* state, const SkRect& chainBounds) {
pipeline,
*pathProc,
&fixedDynamicState,
nullptr);
nullptr, 0);
GrStencilSettings stencil;
init_stencil_pass_settings(*state, this->fillType(), &stencil);

2
src/gpu/ops/GrFillRRectOp.cpp
View File

@ -756,7 +756,7 @@ void GrFillRRectOp::onExecute(GrOpFlushState* flushState, const SkRect& chainBou
*pipeline,
*proc,
fixedDynamicState,
nullptr);
nullptr, 0);
GrMesh* mesh = flushState->allocator()->make<GrMesh>(GrPrimitiveType::kTriangles);
mesh->setIndexedInstanced(

2
tests/GrMeshTest.cpp
View File

@ -416,7 +416,7 @@ void DrawMeshHelper::drawMesh(const GrMesh& mesh) {
fState->drawOpArgs().origin(),
pipeline,
mtp,
nullptr, nullptr);
nullptr, nullptr, 0);
fState->opsRenderPass()->draw(programInfo, &mesh, 1,
SkRect::MakeIWH(kImageWidth, kImageHeight));

2
tests/GrPipelineDynamicStateTest.cpp
View File

@ -160,7 +160,7 @@ private:
pipeline,
primProc,
nullptr,
&dynamicState);
&dynamicState, 0);
flushState->opsRenderPass()->draw(programInfo, meshes.begin(), 4,
SkRect::MakeIWH(kScreenSize, kScreenSize));