summaryrefslogtreecommitdiffstats
path: root/src/mesa/shader/slang
Commit message (Collapse)AuthorAgeFilesLines
* glsl: init var to silence warningBrian Paul2009-09-241-1/+1
|
* glsl: fix missing initializers warningBrian Paul2009-09-241-2/+2
|
* Merge branch 'mesa_7_5_branch' into mesa_7_6_branchBrian Paul2009-09-151-0/+28
|\
| * glsl: remove extra #version directives from concatenated shader sourcesBrian Paul2009-09-141-0/+28
| | | | | | | | | | | | | | | | When we concatenate shaders to do our form of poor-man linking, if there's multiple #version directives, preprocessing fails. This change disables the extra #version directives by changing the first two chars to //. This should help with some Wine issues such as bug 23946.
| * glsl: Silence gcc uninitialized variable warning.Vinson Lee2009-08-241-1/+1
| |
* | glsl: update a texture/sampler commentBrian Paul2009-08-251-1/+1
| |
* | glsl: Silence gcc uninitialized variable warning.Vinson Lee2009-08-241-1/+1
| |
* | glsl: fix incorrect attribute sizeBrian Paul2009-08-131-1/+1
| |
* | glsl: remove duplicate frag input entryBrian Paul2009-08-121-1/+0
| |
* | Merge branch 'new-frag-attribs'Brian Paul2009-08-122-16/+3
|\ \ | | | | | | | | | | | | | | | | | | This branch introduces new FRAG_ATTRIB_FACE and FRAG_ATTRIB_PNTC fragment program inputs for GLSL gl_FrontFacing and gl_PointCoord. Before, these attributes were packed with the FOG attribute. That made things complicated elsewhere.
| * | mesa: add new FRAG_ATTRIB_FACE and FRAG_ATTRIB_PNTC fragment program inputsBrian Paul2009-07-292-16/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, the FOGC attribute contained the fragment fog coord, front/back- face flag and the gl_PointCoord.xy values. Now each of those things are separate fragment program attributes. This simplifies quite a few things in Mesa and gallium. Need to test i965 driver and fix up point coord handling in the gallium/draw module...
* | | glsl: add gl_Vertex, gl_Normal, etc to list of active attributesBrian Paul2009-08-121-0/+19
| | | | | | | | | | | | | | | | | | If a vertex shader uses gl_Vertex, gl_Normal, etc, we need to include them when the user queries the list of active attributes. Before this we were just including the user-defined attributes.
* | | glsl: move predefined shader input/output info/code to slang_builtin.cBrian Paul2009-08-124-103/+199
|/ / | | | | | | | | This is a more logical place for this code. Also add some functions for querying vertex shader input names, types, etc.
* | Merge branch 'mesa_7_5_branch'Brian Paul2009-07-092-7/+9
|\|
| * glsl: do const parameter optimization for array element actual parametersBrian Paul2009-07-091-2/+3
| | | | | | | | | | | | | | | | | | | | When a function parameter is const-qualified we can avoid making a copy of the actual parameter (we basically do a search/replace when inlining). This is now done for array element params too, resulting in better code (fewer MOV instructions). We should allow some other types of function arguments here but let's be conservative for the moment.
| * glsl: fix incorrect indexing for gl_TextureMatrix[i][j]Brian Paul2009-07-091-5/+6
| | | | | | | | | | The two indexes were mixed up when accessing a row of a matrix in an array of matrices.
* | Merge branch 'mesa_7_5_branch'Jakob Bornecrantz2009-07-031-1/+1
|\| | | | | | | | | | | Conflicts: src/mesa/main/dlist.c src/mesa/vbo/vbo_save_api.c
| * mesa/shaders: fix gl_NormalMatrix state parametersKeith Whitwell2009-07-031-1/+1
| | | | | | | | | | | | gl_NormalMatrix is the inverse transpose of the modelview matrix, but as every matrix here needs to be transposed, we end up with {MODELVIEW_MATRIX, INVERSE}.
* | Merge branch 'mesa_7_5_branch'Brian Paul2009-06-267-274/+1166
|\| | | | | | | | | | | | | | | Conflicts: Makefile src/gallium/drivers/softpipe/sp_screen.c src/mesa/main/version.h
| * glsl: check number of varying variables against the limitBrian Paul2009-06-261-4/+9
| | | | | | | | | | | | Link fails if too many varying vars. (cherry picked from master, commit cc58fbcf2c5c88f406818db60910f537e03610d6)
| * glsl: move/simplify error checking for 'return' statementsBrian Paul2009-06-261-22/+14
| |
| * glsl: overhaul 'return' statement handlingBrian Paul2009-06-263-215/+212
| | | | | | | | | | | | | | A new node type (SLANG_OPER_RETURN_INLINED) is used to denote 'return' statements inside inlined functions which need special handling. All glean glsl1 tests pass for EmitContReturn=FALSE and TRUE.
| * glsl: predicate assignments according to __returnFlagBrian Paul2009-06-261-4/+29
| | | | | | | | Fixes glean "function with early return (3)" case (when EmitContReturn=FALSE).
| * glsl: added slang_variable::is_global fieldBrian Paul2009-06-261-0/+1
| |
| * glsl: silence a problem warningBrian Paul2009-06-261-1/+2
| |
| * glsl: code refactoring for return statementsBrian Paul2009-06-261-70/+88
| |
| * glsl: fix assorted regressions related to early-return-removalBrian Paul2009-06-262-14/+35
| |
| * glsl: comments, field reorderingBrian Paul2009-06-261-1/+4
| |
| * glsl: rework loop nesting codeBrian Paul2009-06-262-41/+87
| |
| * glsl: remove test for loop unrolling when we hit conditional cont/breakBrian Paul2009-06-261-4/+0
| | | | | | | | | | This is no longer needed since we added the new _slang_loop_contains_continue_or_break() function/test.
| * glsl: checkpoint: predicate __retVal = expr with __returnFlagBrian Paul2009-06-261-26/+60
| | | | | | | | The glean "function with early return (1)" test passes now.
| * glsl: use new helper functions in _slang_gen_logical_and/or()Brian Paul2009-06-261-15/+9
| |
| * glsl: add commentsBrian Paul2009-06-261-0/+3
| |
| * glsl: checkpoint: replace 'return' with __returnFlag=true;Brian Paul2009-06-261-7/+68
| | | | | | | | Needed for "remove early returns" transformation.
| * glsl: fix up scoping for parent/children in slang_operation_copy()Brian Paul2009-06-261-0/+9
| | | | | | | | This will need more testing, but no regressions seen so far.
| * glsl: fix uninitialized var in _slang_gen_for_without_continue()Brian Paul2009-06-261-1/+1
| |
| * glsl: added slang_operation_free_children()Brian Paul2009-06-262-0/+17
| |
| * glsl: added slang_oper_num_children() helperBrian Paul2009-06-261-0/+7
| |
| * glsl: check-point: declare _returnFlagBrian Paul2009-06-261-0/+33
| |
| * glsl: added slang_operation_insert_child()Brian Paul2009-06-262-0/+23
| |
| * glsl: use slang_generate_declaration() to consolidate some codeBrian Paul2009-06-261-31/+37
| |
| * glsl: remove obsolete commentBrian Paul2009-06-261-3/+0
| |
| * glsl: implement _slang_gen_while_without_continue()Brian Paul2009-06-261-82/+115
| |
| * glsl: fix a bug involving 'continue' in 'for' loopsBrian Paul2009-06-262-23/+44
| | | | | | | | | | | | | | | | Need to execute the for loop's increment code before we continue. Add a slang_assemble_ctx::CurLoopOper field to keep track of the containing loop and avoid the "cont if true" path in this situation. Plus, assorted clean-ups.
| * glsl: added slang_oper_child_const()Brian Paul2009-06-261-0/+8
| |
| * glsl: use _slang_loop_contains_continue_or_break() to check for unrollingBrian Paul2009-06-261-5/+36
| | | | | | | | The previous test failed for nested loops.
| * glsl: use new _slang_loop_contains_continue() helper functionBrian Paul2009-06-261-5/+126
| |
| * glsl: implement continue->break translation for do-while loopsBrian Paul2009-06-261-15/+219
| |
| * glsl: added slang_operation_literal_int/bool() helper functionsBrian Paul2009-06-261-0/+26
| |
| * glsl: don't allocate 0-length children array in slang_operation_copy()Brian Paul2009-06-261-6/+7
| |
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-12 11:04:35 +0000