feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Set up the GLSL variant.

Browse Source
This commit is contained in:
Roberto Raggi
2010-11-26 15:58:17 +01:00
parent 72e04e6501
commit ad25ec2d94
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/glsleditor/glsleditor.cpp
View File

@@ -261,9 +261,12 @@ void GLSLTextEditor::updateDocumentNow()
{ {
m_updateDocumentTimer->stop(); m_updateDocumentTimer->stop();
const int variant = Lexer::Variant_GLSL_Qt | // ### hardcoded int variant = Lexer::Variant_GLSL_Qt; // ### hardcoded
Lexer::Variant_VertexShader |
Lexer::Variant_FragmentShader; if (isVertexShader())
variant |= Lexer::Variant_VertexShader;
if (isFragmentShader())
variant |= Lexer::Variant_FragmentShader;
const QString contents = toPlainText(); // get the code from the editor const QString contents = toPlainText(); // get the code from the editor
const QByteArray preprocessedCode = contents.toLatin1(); // ### use the QtCreator C++ preprocessor. const QByteArray preprocessedCode = contents.toLatin1(); // ### use the QtCreator C++ preprocessor.
@@ -276,9 +279,9 @@ void GLSLTextEditor::updateDocumentNow()
Semantic sem; Semantic sem;
Scope *globalScope = engine.newNamespace(); Scope *globalScope = engine.newNamespace();
sem.translationUnit(plugin->shaderInit()->ast, globalScope, plugin->shaderInit()->engine); sem.translationUnit(plugin->shaderInit()->ast, globalScope, plugin->shaderInit()->engine);
if (isVertexShader()) if (variant & Lexer::Variant_VertexShader)
sem.translationUnit(plugin->vertexShaderInit()->ast, globalScope, plugin->vertexShaderInit()->engine); sem.translationUnit(plugin->vertexShaderInit()->ast, globalScope, plugin->vertexShaderInit()->engine);
if (isFragmentShader()) if (variant & Lexer::Variant_FragmentShader)
sem.translationUnit(plugin->fragmentShaderInit()->ast, globalScope, plugin->fragmentShaderInit()->engine); sem.translationUnit(plugin->fragmentShaderInit()->ast, globalScope, plugin->fragmentShaderInit()->engine);
sem.translationUnit(ast, globalScope, &engine); sem.translationUnit(ast, globalScope, &engine);