diff options
| author | Janne Kangas <janne.kangas@qt.io> | 2019-07-26 14:49:10 +0300 |
|---|---|---|
| committer | Janne Kangas <janne.kangas@qt.io> | 2019-09-30 11:35:54 +0300 |
| commit | 2902563f2f97fe18e3a547e72e66ee57d443df4f (patch) | |
| tree | 99edb279806189ee3f91b95d6adfb1b4ec2d0b1d /src/render/Qt3DSRenderBaseTypes.h | |
| parent | d7b5007145a82f9dd855a6417ad6ec9be960e422 (diff) | |
Indicate effect shader errors in Editorv2.5.0-beta2
Show a pop-up if a shader fails to compile. Compilation takes place when
the effect is added to a object in timeline.
Requires both editor and runtime commits.
Task-id: QT3DS-3598
Change-Id: Ie9b5a960773c16e00ef99bd0a05e581daf008365
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'src/render/Qt3DSRenderBaseTypes.h')
| -rw-r--r-- | src/render/Qt3DSRenderBaseTypes.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/render/Qt3DSRenderBaseTypes.h b/src/render/Qt3DSRenderBaseTypes.h index fa5e6fc..909077d 100644 --- a/src/render/Qt3DSRenderBaseTypes.h +++ b/src/render/Qt3DSRenderBaseTypes.h @@ -37,6 +37,7 @@ #include "foundation/Qt3DSSimpleTypes.h" #include "foundation/Qt3DSMath.h" #include "foundation/Qt3DSVec2.h" +#include <QtCore/qstring.h> namespace qt3ds { @@ -1077,6 +1078,8 @@ struct NVRenderVertFragCompilationResult NVRenderShaderProgram *mShader; ///< contains the program + QString errors; + NVRenderVertFragCompilationResult() : mShaderName("") , mShader(NULL) |