diff options
| author |  Brian Salomon <bsalomon@google.com> | 2016-11-23 01:02:43 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-11-23 01:02:57 +0000 |
| commit | 59dc41175d99d0a31c046aec0c26c4d82a3a3574 (patch) | |
| tree | 5e1d050baec746da7f2fd2a83a128ab4e9d9cd1b /src/gpu/glsl/GrGLSLUniformHandler.h | |
| parent | 83a3b390dbeafb703af9b34049220e88834d10be (diff) | |
Revert "Initial OpenGL Image support."
This reverts commit be34882042048db096baca32ddf4a8b472529804.
Reason for revert: Test failures and shader compilation issues on Android.
Original change's description:
> Initial OpenGL Image support.
>
> This change along with recently landed changes is enough to make the new unit test work and not much else. imageLoad is support but not stores or any other image functions (atomics). Barriers in the shading language or the GL API are not yet hooked up.
>
> GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4182
>
> Change-Id: I5958b7c89e40ae5ee05f7bbaca3b3738162fe5ce
> Reviewed-on: https://skia-review.googlesource.com/4182
> Reviewed-by: Greg Daniel <egdaniel@google.com>
> Reviewed-by: Chris Dalton <csmartdalton@google.com>
> Commit-Queue: Brian Salomon <bsalomon@google.com>
>
TBR=egdaniel@google.com,bsalomon@google.com,csmartdalton@google.com,reviews@skia.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Change-Id: I29a2502c296ae39ed9a999957800414ae46e6f0f
Reviewed-on: https://skia-review.googlesource.com/5129
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'src/gpu/glsl/GrGLSLUniformHandler.h')
| -rw-r--r-- | src/gpu/glsl/GrGLSLUniformHandler.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/gpu/glsl/GrGLSLUniformHandler.h b/src/gpu/glsl/GrGLSLUniformHandler.h index 11ba2f7279..d49fbd4820 100644 --- a/src/gpu/glsl/GrGLSLUniformHandler.h +++ b/src/gpu/glsl/GrGLSLUniformHandler.h @@ -18,9 +18,8 @@ class GrGLSLUniformHandler { public: virtual ~GrGLSLUniformHandler() {} - using UniformHandle = GrGLSLProgramDataManager::UniformHandle; - GR_DEFINE_RESOURCE_HANDLE_CLASS(SamplerHandle); - GR_DEFINE_RESOURCE_HANDLE_CLASS(ImageStorageHandle); + typedef GrGLSLProgramDataManager::UniformHandle UniformHandle; + typedef GrGLSLProgramDataManager::UniformHandle SamplerHandle; /** Add a uniform variable to the current program, that has visibility in one or more shaders. visibility is a bitfield of GrShaderFlag values indicating from which shaders the uniform @@ -68,10 +67,6 @@ private: virtual SamplerHandle addSampler(uint32_t visibility, GrSwizzle, GrSLType, GrSLPrecision, const char* name) = 0; - virtual const GrShaderVar& imageStorageVariable(ImageStorageHandle) const = 0; - virtual ImageStorageHandle addImageStorage(uint32_t visibility, GrSLType type, - GrImageStorageFormat, const char* name) = 0; - virtual UniformHandle internalAddUniformArray(uint32_t visibility, GrSLType type, GrSLPrecision precision, |