diff options
| author |  Brian Salomon <bsalomon@google.com> | 2016-11-21 13:41:08 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-11-21 19:13:43 +0000 |
| commit | 99938a8ef24e2dd5b39f78638742e9b50ab6d9bf (patch) | |
| tree | e3842210db20a4574e9cec37ae7f049aaff27b65 /src/gpu/vk/GrVkUniformHandler.cpp | |
| parent | d728f0c1a94fe926b59d8ebc9ae174019ccd3606 (diff) | |
Merge GrGLSLShaderVar and GrShaderVar
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=5087
Change-Id: Ib8943a1da1ea495554feaf5b0992b94fbb9539ab
Reviewed-on: https://skia-review.googlesource.com/5087
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
Diffstat (limited to 'src/gpu/vk/GrVkUniformHandler.cpp')
| -rw-r--r-- | src/gpu/vk/GrVkUniformHandler.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gpu/vk/GrVkUniformHandler.cpp b/src/gpu/vk/GrVkUniformHandler.cpp index 1da411934d..85b6955177 100644 --- a/src/gpu/vk/GrVkUniformHandler.cpp +++ b/src/gpu/vk/GrVkUniformHandler.cpp @@ -155,7 +155,7 @@ GrGLSLUniformHandler::UniformHandle GrVkUniformHandler::internalAddUniformArray( uni.fVariable.setPrecision(precision); // When outputing the GLSL, only the outer uniform block will get the Uniform modifier. Thus // we set the modifier to none for all uniforms declared inside the block. - uni.fVariable.setTypeModifier(GrGLSLShaderVar::kNone_TypeModifier); + uni.fVariable.setTypeModifier(GrShaderVar::kNone_TypeModifier); uint32_t* currentOffset = kVertex_GrShaderFlag == visibility ? &fCurrentVertexUBOOffset : &fCurrentFragmentUBOOffset; @@ -184,7 +184,7 @@ GrGLSLUniformHandler::SamplerHandle GrVkUniformHandler::addSampler(uint32_t visi UniformInfo& info = fSamplers.push_back(); SkASSERT(GrSLTypeIsCombinedSamplerType(type)); info.fVariable.setType(type); - info.fVariable.setTypeModifier(GrGLSLShaderVar::kUniform_TypeModifier); + info.fVariable.setTypeModifier(GrShaderVar::kUniform_TypeModifier); info.fVariable.setPrecision(precision); info.fVariable.setName(mangleName); SkString layoutQualifier; |