diff options
| author |  Brian Osman <brianosman@google.com> | 2018-02-09 16:25:31 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-02-11 15:54:55 +0000 |
| commit | c5cecdcaf8ab3ad66abc2f88a82bb14279fe3d48 (patch) | |
| tree | 531bb01b862302d9d6be45ca7e225ead17b8ad0a /src | |
| parent | 954295bc700d73656323bef63b25782b563c1eaa (diff) | |
Remove image functions from GrGLInterface, part one
This approximately reverts:
https://skia-review.googlesource.com/c/skia/+/4840
Doing this in two parts for Chromium. Second part is at:
https://skia-review.googlesource.com/c/skia/+/106268
Change-Id: I2b949eadb7537a3ff0de41b404dfe3e363122c53
Reviewed-on: https://skia-review.googlesource.com/106120
Commit-Queue: Brian Osman <brianosman@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/gpu/gl/GrGLAssembleInterface.cpp | 15 | ||||
| -rw-r--r-- | src/gpu/gl/GrGLDefines.h | 8 | ||||
| -rw-r--r-- | src/gpu/gl/GrGLInterface.cpp | 20 |
3 files changed, 0 insertions, 43 deletions
diff --git a/src/gpu/gl/GrGLAssembleInterface.cpp b/src/gpu/gl/GrGLAssembleInterface.cpp index b24fd94d63..5b4bde3610 100644 --- a/src/gpu/gl/GrGLAssembleInterface.cpp +++ b/src/gpu/gl/GrGLAssembleInterface.cpp @@ -398,15 +398,6 @@ sk_sp<const GrGLInterface> GrGLMakeAssembledGLInterface(void *ctx, GrGLGetProc g GET_PROC(DeleteSync); } - if (glVer >= GR_GL_VER(4, 2) || extensions.has("GL_ARB_shader_image_load_store")) { - GET_PROC(BindImageTexture); - GET_PROC(MemoryBarrier); - } - if (glVer >= GR_GL_VER(4, 5) || extensions.has("GL_ARB_ES3_1_compatibility")) { - GET_PROC(MemoryBarrierByRegion); - } - - if (glVer >= GR_GL_VER(4,2) || extensions.has("GL_ARB_internalformat_query")) { GET_PROC(GetInternalformativ); } @@ -833,12 +824,6 @@ sk_sp<const GrGLInterface> GrGLMakeAssembledGLESInterface(void *ctx, GrGLGetProc GET_PROC_SUFFIX(DeleteSync, APPLE); } - if (version >= GR_GL_VER(3, 1)) { - GET_PROC(BindImageTexture); - GET_PROC(MemoryBarrier); - GET_PROC(MemoryBarrierByRegion); - } - if (version >= GR_GL_VER(3,0)) { GET_PROC(GetInternalformativ); } diff --git a/src/gpu/gl/GrGLDefines.h b/src/gpu/gl/GrGLDefines.h index 51ab7fb300..9da060b412 100644 --- a/src/gpu/gl/GrGLDefines.h +++ b/src/gpu/gl/GrGLDefines.h @@ -242,14 +242,6 @@ #define GR_GL_MULTISAMPLE_COVERAGE_MODES 0x8E12 #define GR_GL_MAX_TEXTURE_BUFFER_SIZE 0x8C2B -#define GR_GL_MAX_IMAGE_UNITS 0x8F38 -#define GR_GL_MAX_COMBINED_IMAGE_UNITS_AND_FRAGMENT_OUTPUTS 0x8F39 -#define GR_GL_MAX_IMAGE_SAMPLES 0x906D -#define GR_GL_MAX_VERTEX_IMAGE_UNIFORMS 0x90CA -#define GR_GL_MAX_GEOMETRY_IMAGE_UNIFORMS 0x90CD -#define GR_GL_MAX_FRAGMENT_IMAGE_UNIFORMS 0x90CE -#define GR_GL_MAX_COMBINED_IMAGE_UNIFORMS 0x90CF - /* GetTextureParameter */ /* GL_TEXTURE_MAG_FILTER */ /* GL_TEXTURE_MIN_FILTER */ diff --git a/src/gpu/gl/GrGLInterface.cpp b/src/gpu/gl/GrGLInterface.cpp index e52324fbd4..10b7b16dd9 100644 --- a/src/gpu/gl/GrGLInterface.cpp +++ b/src/gpu/gl/GrGLInterface.cpp @@ -628,26 +628,6 @@ bool GrGLInterface::validate() const { } } - if (kGL_GrGLStandard == fStandard) { - if (glVer >= GR_GL_VER(4,2) || fExtensions.has("GL_ARB_shader_image_load_store")) { - if (!fFunctions.fBindImageTexture || - !fFunctions.fMemoryBarrier) { - RETURN_FALSE_INTERFACE; - } - } - if (glVer >= GR_GL_VER(4,5) || fExtensions.has("GL_ARB_ES3_1_compatibility")) { - if (!fFunctions.fMemoryBarrierByRegion) { - RETURN_FALSE_INTERFACE; - } - } - } else if (kGLES_GrGLStandard == fStandard && glVer >= GR_GL_VER(3,1)) { - if (!fFunctions.fBindImageTexture || - !fFunctions.fMemoryBarrier || - !fFunctions.fMemoryBarrierByRegion) { - RETURN_FALSE_INTERFACE; - } - } - // getInternalformativ was added in GL 4.2, ES 3.0, and with extension ARB_internalformat_query if ((kGL_GrGLStandard == fStandard && (glVer >= GR_GL_VER(4,2) || fExtensions.has("GL_ARB_internalformat_query"))) || |