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

Use texparameterf[v]

Browse Source 
Change-Id: I96191353fd6d75c1024bf452202d3e4e681afcf6
Reviewed-on: https://skia-review.googlesource.com/c/175829
Reviewed-by: Michael Ludwig <michaelludwig@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
This commit is contained in:
Brian Salomon 2018-12-07 19:30:25 -05:00 committed by Skia Commit-Bot
parent 4616f5521d
commit 89f2ff1931
2 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/gpu/gl/GrGLGpu.cpp
View File

@ -2863,8 +2863,8 @@ void GrGLGpu::bindTexture(int unitIdx, GrSamplerState samplerState, GrGLTexture*
newSamplerParams.fWrapT = wrap_mode_to_gl_wrap(samplerState.wrapModeY(), this->glCaps());
// These are the OpenGL default values.
newSamplerParams.fMinLOD = -1000;
newSamplerParams.fMaxLOD = 1000;
newSamplerParams.fMinLOD = -1000.f;
newSamplerParams.fMaxLOD = 1000.f;
if (setAll || newSamplerParams.fMagFilter != oldSamplerParams.fMagFilter) {
this->setTextureUnit(unitIdx);
@ -2875,15 +2875,13 @@ void GrGLGpu::bindTexture(int unitIdx, GrSamplerState samplerState, GrGLTexture*
GL_CALL(TexParameteri(target, GR_GL_TEXTURE_MIN_FILTER, newSamplerParams.fMinFilter));
}
if (this->glCaps().mipMapLevelAndLodControlSupport()) {
// Min and max LOD are actually floats. We don't curently support glTexParameterf.
// However, we only set these to integral floats (see above).
if (setAll || newSamplerParams.fMinLOD != oldSamplerParams.fMinLOD) {
this->setTextureUnit(unitIdx);
GL_CALL(TexParameteri(target, GR_GL_TEXTURE_MIN_LOD, newSamplerParams.fMinLOD));
GL_CALL(TexParameterf(target, GR_GL_TEXTURE_MIN_LOD, newSamplerParams.fMinLOD));
}
if (setAll || newSamplerParams.fMaxLOD != oldSamplerParams.fMaxLOD) {
this->setTextureUnit(unitIdx);
GL_CALL(TexParameteri(target, GR_GL_TEXTURE_MAX_LOD, newSamplerParams.fMaxLOD));
GL_CALL(TexParameterf(target, GR_GL_TEXTURE_MAX_LOD, newSamplerParams.fMaxLOD));
}
}
if (setAll || newSamplerParams.fWrapS != oldSamplerParams.fWrapS) {
@ -2898,11 +2896,8 @@ void GrGLGpu::bindTexture(int unitIdx, GrSamplerState samplerState, GrGLTexture*
// Make sure the border color is transparent black (the default)
if (setAll || oldSamplerParams.fBorderColorInvalid) {
this->setTextureUnit(unitIdx);
// Specify the transparent black as normalized signed integers. The conversion is
// defined as (2c+1)/(2^32-1), which makes it impossible to map a signed in to
// exactly 0.f. But 1/(2^32-1) is close enough.
static const GrGLint kTransparentBlack[4] = {0, 0, 0, 0};
GL_CALL(TexParameteriv(target, GR_GL_TEXTURE_BORDER_COLOR, kTransparentBlack));
static const GrGLfloat kTransparentBlack[4] = {0.f, 0.f, 0.f, 0.f};
GL_CALL(TexParameterfv(target, GR_GL_TEXTURE_BORDER_COLOR, kTransparentBlack));
}
}
}

2
src/gpu/gl/GrGLInterface.cpp
View File

@ -96,10 +96,8 @@ bool GrGLInterface::validate() const {
!fFunctions.fStencilOp ||
!fFunctions.fStencilOpSeparate ||
!fFunctions.fTexImage2D ||
#if 0 // Check these once Chrome is updated to provide these functions.
!fFunctions.fTexParameterf ||
!fFunctions.fTexParameterfv ||
#endif
!fFunctions.fTexParameteri ||
!fFunctions.fTexParameteriv ||
!fFunctions.fTexSubImage2D ||