diff options
author | Liang Qi <liang.qi@qt.io> | 2016-05-12 07:31:50 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-05-12 08:33:08 +0200 |
commit | 990969655c5fb4d03682e96df9b12101f5ee9815 (patch) | |
tree | b8fb5c50285105c8bc5a938fb50f93ff9f24889d /src/3rdparty/angle/src/libANGLE/renderer/ImplFactory.h | |
parent | a213011a53f12f101d08a04afc8fdacd2d54a232 (diff) | |
parent | e64b2234e829cc47872225debcf80d6c06db18f0 (diff) |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
config_help.txt
configure
src/corelib/io/qprocess_wince.cpp
src/plugins/platforms/windows/qwindowstheme.cpp
src/plugins/platforms/xcb/qxcbbackingstore.cpp
tests/auto/corelib/tools/qtimezone/BLACKLIST
tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp
tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
Change-Id: I26644d1cb3b78412c8ff285e2a55bea1bd641c01
Diffstat (limited to 'src/3rdparty/angle/src/libANGLE/renderer/ImplFactory.h')
-rw-r--r-- | src/3rdparty/angle/src/libANGLE/renderer/ImplFactory.h | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/src/3rdparty/angle/src/libANGLE/renderer/ImplFactory.h b/src/3rdparty/angle/src/libANGLE/renderer/ImplFactory.h index d77e59f7df..b988fcf97f 100644 --- a/src/3rdparty/angle/src/libANGLE/renderer/ImplFactory.h +++ b/src/3rdparty/angle/src/libANGLE/renderer/ImplFactory.h @@ -11,6 +11,9 @@ #define LIBANGLE_RENDERER_IMPLFACTORY_H_ #include "libANGLE/Framebuffer.h" +#include "libANGLE/Program.h" +#include "libANGLE/Shader.h" +#include "libANGLE/VertexArray.h" namespace rx { @@ -22,6 +25,7 @@ class FramebufferImpl; class ProgramImpl; class QueryImpl; class RenderbufferImpl; +class SamplerImpl; class ShaderImpl; class TextureImpl; class TransformFeedbackImpl; @@ -34,12 +38,11 @@ class ImplFactory : angle::NonCopyable virtual ~ImplFactory() {} // Shader creation - virtual CompilerImpl *createCompiler(const gl::Data &data) = 0; - virtual ShaderImpl *createShader(GLenum type) = 0; - virtual ProgramImpl *createProgram() = 0; + virtual CompilerImpl *createCompiler() = 0; + virtual ShaderImpl *createShader(const gl::Shader::Data &data) = 0; + virtual ProgramImpl *createProgram(const gl::Program::Data &data) = 0; // Framebuffer creation - virtual FramebufferImpl *createDefaultFramebuffer(const gl::Framebuffer::Data &data) = 0; virtual FramebufferImpl *createFramebuffer(const gl::Framebuffer::Data &data) = 0; // Texture creation @@ -52,7 +55,7 @@ class ImplFactory : angle::NonCopyable virtual BufferImpl *createBuffer() = 0; // Vertex Array creation - virtual VertexArrayImpl *createVertexArray() = 0; + virtual VertexArrayImpl *createVertexArray(const gl::VertexArray::Data &data) = 0; // Query and Fence creation virtual QueryImpl *createQuery(GLenum type) = 0; @@ -61,6 +64,9 @@ class ImplFactory : angle::NonCopyable // Transform Feedback creation virtual TransformFeedbackImpl *createTransformFeedback() = 0; + + // Sampler object creation + virtual SamplerImpl *createSampler() = 0; }; } |