Commit 74e16084 by Corentin Wallez

CompilerGL: Use mOutputType when creating the compiler

BUG=angleproject:892 Change-Id: Id6bbc4059f92ff7d8d291583cd30dbd4cd5e9bd3 Reviewed-on: https://chromium-review.googlesource.com/268969Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Tested-by: 's avatarCorentin Wallez <cwallez@chromium.org>
parent a897542f
...@@ -21,6 +21,7 @@ static size_t activeCompilerHandles = 0; ...@@ -21,6 +21,7 @@ static size_t activeCompilerHandles = 0;
CompilerGL::CompilerGL(const gl::Data &data) CompilerGL::CompilerGL(const gl::Data &data)
: CompilerImpl(), : CompilerImpl(),
mSpec(data.clientVersion > 2 ? SH_GLES3_SPEC : SH_GLES2_SPEC), mSpec(data.clientVersion > 2 ? SH_GLES3_SPEC : SH_GLES2_SPEC),
mOutputType(SH_GLSL_OUTPUT),
mResources(), mResources(),
mFragmentCompiler(nullptr), mFragmentCompiler(nullptr),
mVertexCompiler(nullptr) mVertexCompiler(nullptr)
...@@ -111,7 +112,7 @@ ShHandle CompilerGL::getCompilerHandle(GLenum type) ...@@ -111,7 +112,7 @@ ShHandle CompilerGL::getCompilerHandle(GLenum type)
ShInitialize(); ShInitialize();
} }
*compiler = ShConstructCompiler(type, mSpec, SH_GLSL_OUTPUT, &mResources); *compiler = ShConstructCompiler(type, mSpec, mOutputType, &mResources);
activeCompilerHandles++; activeCompilerHandles++;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment