diff options
| author | Laszlo Agocs <laszlo.agocs@qt.io> | 2016-06-27 16:10:04 +0200 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2016-06-29 11:59:46 +0000 |
| commit | 12bff27aa6f1caac9bfacf365c542cf5da6e3148 (patch) | |
| tree | 32a0ec27aabb1b73c3fd62f7dcec768bc24b4eb9 /src/quick/scenegraph/qsgdefaultcontext.cpp | |
| parent | a174ed2a996bf6311e849c8d8f31bbe307c6838b (diff) | |
Add support for reading GLSL from files with ShaderEffect
An enabler for using file selectors instead of writing GraphicsInfo-based
conditions in the vertexShader and fragmentShader properties.
[ChangeLog][QtQuick] ShaderEffect with OpenGL now supports reading GLSL
shader sources from local files and from the resource system. Whenever a
fragmentShader or vertexShader property is a valid such URL, the value is
treated as a file specification instead of actual source code.
Change-Id: I9df2a397adc8f82f1eb6b83d27e9e3d9d1a02f46
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
Diffstat (limited to 'src/quick/scenegraph/qsgdefaultcontext.cpp')
| -rw-r--r-- | src/quick/scenegraph/qsgdefaultcontext.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/scenegraph/qsgdefaultcontext.cpp b/src/quick/scenegraph/qsgdefaultcontext.cpp index a33f4b174f..8272be987b 100644 --- a/src/quick/scenegraph/qsgdefaultcontext.cpp +++ b/src/quick/scenegraph/qsgdefaultcontext.cpp @@ -272,7 +272,7 @@ QSGRendererInterface::ShaderCompilationTypes QSGDefaultContext::shaderCompilatio QSGRendererInterface::ShaderSourceTypes QSGDefaultContext::shaderSourceType() const { - return ShaderSourceString; + return ShaderSourceString | ShaderSourceFile; } QT_END_NAMESPACE |