summaryrefslogtreecommitdiff
path: root/src/libs/glsl/glslparser.h
Commit message (Collapse)AuthorAgeFilesLines
* GLSL: Fix conversion warnings on WindowsNikolai Kosjar2017-09-281-1/+1
| | | | | | | | | | | | | | This was actually already fixed with Fix compiler warnings on windows. commit cc04b84917ef0f90e2017bf652b7327ce5edda9c. However, glslparser.{h,cpp} were changed, which are generated from glsl.g. Fix the warnings in the source file glsl.g so the next time the parser is re-generated the changes are not lost. Change-Id: If7e5f45ff1a93d1d7b6c9213697884f5a7e9ec5f Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
* GLSL: Re-generate parserNikolai Kosjar2017-09-281-2/+2
| | | | | | | | | ...by running ./make-parser.sh to make a subsequent change less noisy. qlalr in PATH is from Qt 5.9.1. Change-Id: Ia39181b55cd0e16207fa809f0db92cdeba3b095c Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
* Fix compiler warnings on windows.David Schulz2016-04-221-1/+1
| | | | | | | | | | | Ignore some warnings inside 3rd party code and fix a lot of conversion warnings. Change-Id: I909f2f31a4639015bf7dd028d2d435ff1d1167bc Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com> Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com> Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
* Update License according to agreement with Free Qt FoundationTobias Hunger2016-01-191-17/+12
| | | | | | | * Update remaining files in src Change-Id: I1896f17fcf34f71c3310c87899fb5171b8e4afb1 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* Update LicenseEike Ziller2015-01-161-6/+6
| | | | | Change-Id: I711d5fb475ef814a1dc9d2822740e827f3f67125 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* License updateEike Ziller2014-10-091-7/+8
| | | | | Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* Incremented year in copyright infoRobert Loehning2014-01-081-1/+1
| | | | | | Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Incremented year in copyright infov2.6.2Robert Loehning2013-01-291-1/+1
| | | | | Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Adjust license headershjk2012-10-051-21/+20
| | | | | Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* GLSL: Fix recovery token order to avoid infinite loop.Christian Kamm2012-08-071-1/+1
| | | | | | | | The case 'a = b ? ;' recovered with T_NUMBER, T_COMMA, T_NUMBER, ... Task-number: QTCREATORBUG-7517 Change-Id: I3546266b21d11ce08e4af1331be94a78d3b24c19 Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* Contact -> qt-project.orgEike Ziller2012-07-191-3/+1
| | | | | Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Long live the king!hjk2012-01-261-1/+1
| | | | | Change-Id: I2b72b34c0cfeafc8bdbaf49b83ff723544f2b6e2 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* all: s/info@qt.nokia.com/qt-info@nokia.com/hjk2011-11-031-2/+2
| | | | | Change-Id: If18afb5d4665924e7d9250dccbc60a65e6daa75e Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Fix/add copyright headersTobias Hunger2011-05-061-1/+1
| | | | Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
* Fix possible crash when parsing layout qualifiers nodes.Roberto Raggi2011-04-181-4/+4
| | | | | Task-number: QTCREATORBUG-4563 Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
* Update license.hjk2011-04-131-14/+13
|
* Fixed (C)opyright headers.Erik Verbruggen2011-02-211-1/+1
|
* s:// end of namespace :// namespace :g for consistencyhjk2011-02-041-1/+1
| | | | We use the latter style everywhere else to signify the end of a namespace block.
* It's 2011 now.con2011-01-121-1/+1
| | | | Reviewed-by: hjk
* License headers, part 2con2010-12-171-7/+11
|
* Handle logical xor.Roberto Raggi2010-11-301-1/+1
|
* Implemented some basic code completion.Roberto Raggi2010-11-291-4/+26
|
* Simple error recovery.Roberto Raggi2010-11-291-2/+9
| | | | Well, it's not very advanced but it is probably good enough for now.
* Remove type categories from the GLSL ASTRhys Weatherley2010-11-291-2/+2
| | | | | Type categories are now handled at semantic analysis time so we don't need to track them at syntax analysis time.
* Added Engine::blockDiagnosticMessages()Roberto Raggi2010-11-261-10/+2
|
* Added the suffix AST to the ast nodes and some initial work on the GLSL type ↵Roberto Raggi2010-11-251-28/+28
| | | | system.
* Highlight reserved GLSL keywordsRhys Weatherley2010-11-231-1/+1
|
* Report the syntax errors.Roberto Raggi2010-11-191-1/+19
|
* Use QString instead of std::string in GLSL parserRhys Weatherley2010-11-181-3/+3
|
* GLSL AST nodes for function and struct declsRhys Weatherley2010-11-181-1/+3
|
* Variable and parameter declarations for GLSLRhys Weatherley2010-11-171-0/+4
|
* Create AST nodes for qualified GLSL typesRhys Weatherley2010-11-151-0/+7
|
* Build AST nodes from within the parser.Rhys Weatherley2010-11-121-0/+30
|
* Making GLSL AST nodes while preserving lineno infoRhys Weatherley2010-11-121-0/+42
| | | | | | | Eventually we will need some way to locate an identifier's definition, so add "lineno" to each AST node. May want to change this to "position" later. The makeAstNode<T>() function takes care of automatically decorating nodes with line numbers.
* Create AST nodes for multiplicative expressions.Roberto Raggi2010-11-111-0/+3
|
* Introduced a simple memory pool.Roberto Raggi2010-11-111-0/+1
|
* Get rid of glsl.g.in and start working on the semantic actions.Roberto Raggi2010-11-111-5/+22
|
* Introduced a simple incremental lexer for GLSL.Roberto Raggi2010-11-101-0/+29
|
* Imported our new GLSL front-end.Roberto Raggi2010-11-101-0/+33
View Lorry Controller Status