diff options
author | 2018-07-12 14:53:49 -0400 | |
---|---|---|
committer | 2018-07-13 00:45:54 +0000 | |
commit | 662ea4baba570d2f21a7b33d268204e9bdfa7fb9 (patch) | |
tree | 71da861d0d9b8f014e7f09f89b122480e067e8c0 /src/gpu/gl/GrGLCaps.cpp | |
parent | 13ac194dbf9968d356e580b85420f1314f453a10 (diff) |
Remove texel buffer support.
Change-Id: Ia6f21afe714208979a5bc384e436b28ea2b9a297
Reviewed-on: https://skia-review.googlesource.com/141051
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'src/gpu/gl/GrGLCaps.cpp')
-rw-r--r-- | src/gpu/gl/GrGLCaps.cpp | 50 |
1 files changed, 0 insertions, 50 deletions
diff --git a/src/gpu/gl/GrGLCaps.cpp b/src/gpu/gl/GrGLCaps.cpp index f120b6d09d..8525a7b2b5 100644 --- a/src/gpu/gl/GrGLCaps.cpp +++ b/src/gpu/gl/GrGLCaps.cpp @@ -786,31 +786,6 @@ void GrGLCaps::initGLSL(const GrGLContextInfo& ctxInfo, const GrGLInterface* gli } if (kGL_GrGLStandard == standard) { - shaderCaps->fTexelFetchSupport = ctxInfo.glslGeneration() >= k130_GrGLSLGeneration; - } else { - shaderCaps->fTexelFetchSupport = - ctxInfo.glslGeneration() >= k330_GrGLSLGeneration; // We use this value for GLSL ES 3.0. - } - - if (shaderCaps->fTexelFetchSupport) { - if (kGL_GrGLStandard == standard) { - shaderCaps->fTexelBufferSupport = ctxInfo.version() >= GR_GL_VER(3, 1) && - ctxInfo.glslGeneration() >= k330_GrGLSLGeneration; - } else { - if (ctxInfo.version() >= GR_GL_VER(3, 2) && - ctxInfo.glslGeneration() >= k320es_GrGLSLGeneration) { - shaderCaps->fTexelBufferSupport = true; - } else if (ctxInfo.hasExtension("GL_OES_texture_buffer")) { - shaderCaps->fTexelBufferSupport = true; - shaderCaps->fTexelBufferExtensionString = "GL_OES_texture_buffer"; - } else if (ctxInfo.hasExtension("GL_EXT_texture_buffer")) { - shaderCaps->fTexelBufferSupport = true; - shaderCaps->fTexelBufferExtensionString = "GL_EXT_texture_buffer"; - } - } - } - - if (kGL_GrGLStandard == standard) { shaderCaps->fVertexIDSupport = true; } else { // Desktop GLSL 3.30 == ES GLSL 3.00. @@ -1396,8 +1371,6 @@ void GrGLCaps::initConfigTable(const GrContextOptions& contextOptions, ctxInfo.hasExtension("GL_EXT_texture_storage"); } - bool texelBufferSupport = this->shaderCaps()->texelBufferSupport(); - bool textureRedSupport = false; if (!disableTextureRedForMesa) { @@ -1436,9 +1409,6 @@ void GrGLCaps::initConfigTable(const GrContextOptions& contextOptions, if (texStorageSupported) { fConfigTable[kRGBA_8888_GrPixelConfig].fFlags |= ConfigInfo::kCanUseTexStorage_Flag; } - if (texelBufferSupport) { - fConfigTable[kRGBA_8888_GrPixelConfig].fFlags |= ConfigInfo::kCanUseWithTexelBuffer_Flag; - } fConfigTable[kRGBA_8888_GrPixelConfig].fSwizzle = GrSwizzle::RGBA(); fConfigTable[kRGB_888_GrPixelConfig].fFormats.fBaseInternalFormat = GR_GL_RGB; @@ -1678,9 +1648,6 @@ void GrGLCaps::initConfigTable(const GrContextOptions& contextOptions, if (texStorageSupported) { fConfigTable[kRGBA_1010102_GrPixelConfig].fFlags |= ConfigInfo::kCanUseTexStorage_Flag; } - if (texelBufferSupport) { - fConfigTable[kRGBA_1010102_GrPixelConfig].fFlags |= ConfigInfo::kCanUseWithTexelBuffer_Flag; - } fConfigTable[kRGBA_1010102_GrPixelConfig].fSwizzle = GrSwizzle::RGBA(); bool alpha8IsValidForGL = kGL_GrGLStandard == standard && @@ -1718,10 +1685,6 @@ void GrGLCaps::initConfigTable(const GrContextOptions& contextOptions, if (textureRedSupport) { redInfo.fFlags |= ConfigInfo::kTextureable_Flag | allRenderFlags; - if (texelBufferSupport) { - redInfo.fFlags |= ConfigInfo::kCanUseWithTexelBuffer_Flag; - } - fConfigTable[kAlpha_8_GrPixelConfig] = redInfo; } else { redInfo.fFlags = 0; @@ -1768,9 +1731,6 @@ void GrGLCaps::initConfigTable(const GrContextOptions& contextOptions, } if (textureRedSupport) { - if (texelBufferSupport) { - grayRedInfo.fFlags |= ConfigInfo::kCanUseWithTexelBuffer_Flag; - } fConfigTable[kGray_8_GrPixelConfig] = grayRedInfo; } else { grayRedInfo.fFlags = 0; @@ -1830,9 +1790,6 @@ void GrGLCaps::initConfigTable(const GrContextOptions& contextOptions, if (texStorageSupported) { fConfigTable[fpconfig].fFlags |= ConfigInfo::kCanUseTexStorage_Flag; } - if (texelBufferSupport) { - fConfigTable[fpconfig].fFlags |= ConfigInfo::kCanUseWithTexelBuffer_Flag; - } fConfigTable[fpconfig].fSwizzle = GrSwizzle::RGBA(); } @@ -1860,10 +1817,6 @@ void GrGLCaps::initConfigTable(const GrContextOptions& contextOptions, if (texStorageSupported && !isCommandBufferES2) { redHalf.fFlags |= ConfigInfo::kCanUseTexStorage_Flag; } - - if (texelBufferSupport) { - redHalf.fFlags |= ConfigInfo::kCanUseWithTexelBuffer_Flag; - } } fConfigTable[kAlpha_half_GrPixelConfig] = redHalf; @@ -1888,9 +1841,6 @@ void GrGLCaps::initConfigTable(const GrContextOptions& contextOptions, if (texStorageSupported) { fConfigTable[kRGBA_half_GrPixelConfig].fFlags |= ConfigInfo::kCanUseTexStorage_Flag; } - if (texelBufferSupport) { - fConfigTable[kRGBA_half_GrPixelConfig].fFlags |= ConfigInfo::kCanUseWithTexelBuffer_Flag; - } fConfigTable[kRGBA_half_GrPixelConfig].fSwizzle = GrSwizzle::RGBA(); // Bulk populate the texture internal/external formats here and then deal with exceptions below. |