diff options
author | Oliver Wolff <oliver.wolff@theqtcompany.com> | 2016-03-24 12:38:18 +0100 |
---|---|---|
committer | Oliver Wolff <oliver.wolff@qt.io> | 2016-04-25 05:57:38 +0000 |
commit | e12ba07322cd61c5cf50c25ed8d1f08f6b1ff879 (patch) | |
tree | d31a44c9f123ed764a00eff7b4fff656a07d54ab /src/3rdparty/angle/src/libANGLE/Compiler.h | |
parent | d3dcc6f610b97be7cbfbb0a65988e5940568c825 (diff) |
Update ANGLE to chromium/2651
Change-Id: I1cd32b780b1a0b913fab870e155ae1f4f9ac40d7
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
Diffstat (limited to 'src/3rdparty/angle/src/libANGLE/Compiler.h')
-rw-r--r-- | src/3rdparty/angle/src/libANGLE/Compiler.h | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/src/3rdparty/angle/src/libANGLE/Compiler.h b/src/3rdparty/angle/src/libANGLE/Compiler.h index 05de15ec97..8634e39a45 100644 --- a/src/3rdparty/angle/src/libANGLE/Compiler.h +++ b/src/3rdparty/angle/src/libANGLE/Compiler.h @@ -11,29 +11,39 @@ #define LIBANGLE_COMPILER_H_ #include "libANGLE/Error.h" +#include "GLSLANG/ShaderLang.h" namespace rx { class CompilerImpl; +class ImplFactory; } namespace gl { +struct Data; -class Compiler final +class Compiler final : angle::NonCopyable { public: - explicit Compiler(rx::CompilerImpl *impl); + Compiler(rx::ImplFactory *implFactory, const Data &data); ~Compiler(); Error release(); - rx::CompilerImpl *getImplementation(); + ShHandle getCompilerHandle(GLenum type); + ShShaderOutput getShaderOutputType() const { return mOutputType; } private: - rx::CompilerImpl *mCompiler; + rx::CompilerImpl *mImplementation; + ShShaderSpec mSpec; + ShShaderOutput mOutputType; + ShBuiltInResources mResources; + + ShHandle mFragmentCompiler; + ShHandle mVertexCompiler; }; -} +} // namespace gl #endif // LIBANGLE_COMPILER_H_ |