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

Revert "Set multitexturing threshold for NVIDIA"

Browse Source 
This reverts commit b4ec104318.

Reason for revert: to revert another change

Original change's description:
> Set multitexturing threshold for NVIDIA
> 
> Change-Id: Ie992b34b8fdd3bf569241cce7c851880258f05df
> Reviewed-on: https://skia-review.googlesource.com/78261
> Commit-Queue: Brian Salomon <bsalomon@google.com>
> Reviewed-by: Robert Phillips <robertphillips@google.com>

TBR=bsalomon@google.com,robertphillips@google.com

Change-Id: I87923d039d2f2fe17fb73b5e8f45b0c3f6dfedf2
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/78541
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
This commit is contained in:
Brian Salomon 2017-11-30 19:08:10 +00:00 committed by Skia Commit-Bot
parent 25b1778078
commit 48ed0043a9
2 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/gpu/gl/GrGLCaps.cpp
View File

@ -358,17 +358,6 @@ void GrGLCaps::init(const GrContextOptions& contextOptions,
GR_GL_GetIntegerv(gli, GR_GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS, &maxSamplers);
shaderCaps->fMaxCombinedSamplers = SkTMin<GrGLint>(kMaxSaneSamplers, maxSamplers);
// This is all *very* approximate.
switch (ctxInfo.vendor()) {
case kNVIDIA_GrGLVendor:
// We've seen a range from 100 x 100 (TegraK1, GTX660) up to 300 x 300 (GTX 1070)
// but it doesn't clearly align with Pascal vs Maxwell vs Kepler.
fShaderCaps->fDisableImageMultitexturingDstRectAreaThreshold = 150 * 150;
break;
default:
break;
}
// SGX and Mali GPUs that are based on a tiled-deferred architecture that have trouble with
// frequently changing VBOs. We've measured a performance increase using non-VBO vertex
// data for dynamic content on these GPUs. Perhaps we should read the renderer string and

7
src/gpu/ops/GrTextureOp.cpp
View File

@ -478,11 +478,6 @@ private:
fDraws[i].fTextureIdx = map[fDraws[i].fTextureIdx];
}
} else {
// We can get here when one of the ops is already multitextured but the other cannot
// be because of the dst rect size.
if (fProxyCnt > 1 || that->fProxyCnt > 1) {
return false;
}
if (fProxy0->uniqueID() != that->fProxy0->uniqueID() || fFilter0 != that->fFilter0) {
return false;
}
@ -575,13 +570,13 @@ private:
GrTextureProxy* fProxy0;
GrTextureProxy** fProxyArray;
};
size_t fMaxApproxDstPixelArea;
// The next four members should pack.
GrSamplerState::Filter fFilter0;
uint8_t fProxyCnt;
// Used to track whether fProxy is ref'ed or has a pending IO after finalize() is called.
uint8_t fFinalized;
uint8_t fAllowSRGBInputs;
size_t fMaxApproxDstPixelArea;
typedef GrMeshDrawOp INHERITED;
};