aboutsummaryrefslogtreecommitdiffstats
path: root/src/mesa/shader
Commit message (Collapse)AuthorAgeFilesLines
* re-add MSAA supportBrian Paul2009-02-091-1/+1
| | | | | | | | | (cherry picked from commit f7d80aa00611917bc8ce637136d982b151b8f44f) This also involved adding the new MSAA fields to driCreateConfigs(). Also, re-add prog_instructions->Sampler field for i965 driver. Will have to revisit that.
* mesa: merge gallium-0.2 into gallium-master-mergeBrian Paul2009-02-0916-151/+186
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'origin/gallium-0.2' into gallium-master-merge Conflicts: Makefile docs/relnotes-7.4.html docs/relnotes.html src/mesa/drivers/dri/i965/brw_wm.h src/mesa/main/imports.c src/mesa/main/mtypes.h src/mesa/main/texcompress.c src/mesa/main/texenvprogram.c src/mesa/main/version.h src/mesa/vbo/vbo_exec_api.c src/mesa/vbo/vbo_save_draw.c
| * Merge commit 'origin/master' into gallium-0.2Alan Hourihane2009-01-222-0/+3
| |\ | | | | | | | | | | | | | | | | | | Conflicts: windows/VC8/mesa/osmesa/osmesa.vcproj windows/VC8/progs/demos/gears.vcproj windows/VC8/progs/progs.sln
| * \ Merge commit 'origin/master' into gallium-0.2Alan Hourihane2009-01-165-10/+24
| |\ \ | | | | | | | | | | | | | | | | Conflicts: src/mesa/shader/slang/slang_compile.c
| * | | mesa: Fix merge conflictsJakob Bornecrantz2009-01-151-15/+0
| | | |
| * | | Merge commit 'origin/master' into gallium-0.2Alan Hourihane2009-01-1415-68/+260
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: docs/install.html docs/relnotes-7.3.html src/mesa/shader/slang/slang_codegen.c src/mesa/shader/slang/slang_compile.c src/mesa/shader/slang/slang_emit.c src/mesa/shader/slang/slang_preprocess.c src/mesa/shader/slang/slang_preprocess.h
| * | | | glsl: fix regression from sampler arrays commitAlan Hourihane2009-01-141-3/+1
| | | | |
| * | | | glsl: fix a comment typoAlan Hourihane2009-01-131-1/+1
| | | | |
| * | | | glsl: support sampler arrays.Alan Hourihane2009-01-133-11/+49
| | | | |
| * | | | glsl: fix typo in the vec2 += operator functionBrian Paul2009-01-092-2/+2
| | | | |
| * | | | glsl: fix broken +=, -=, *=, /= operatorsBrian Paul2009-01-092-737/+786
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These functions need to return the final computed value. Now expressions such as a = (b += c) work properly. Also, no need to use __asm intrinsics in these functions. The resulting code is the same when using ordinary arithmetic operators and is more legible.
| * | | | mesa: fix off-by-one bug in _mesa_delete_instructions()Brian Paul2009-01-091-1/+1
| | | | |
| * | | | mesa: additional case in file_string()Brian Paul2009-01-091-0/+2
| | | | |
| * | | | glsl: pass GLcontext::Extension info down into GLSL preprocessorBrian Paul2009-01-093-35/+65
| | | | | | | | | | | | | | | | | | | | Now the #extension directives can be handled properly.
| * | | | glsl: bump up MAX_FOR_LOOP_UNROLL_COMPLEXITYBrian Paul2009-01-091-1/+1
| | | | |
| * | | | glsl: check that the fragment shader does not write both gl_FragColor and ↵Brian Paul2009-01-091-0/+11
| | | | | | | | | | | | | | | | | | | | gl_FragData[]
| * | | | glsl: disable some unused functions (but don't remove just yet)Brian Paul2009-01-091-1/+8
| | | | |
| * | | | glsl: also unroll loops with variable declarations such as "for (int i = 0; ..."Brian Paul2009-01-091-24/+58
| | | | |
| * | | | glsl: remove dead codeBrian Paul2009-01-091-13/+2
| | | | |
| * | | | glsl: loop unroll adjustmentsBrian Paul2009-01-091-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a "max complexity" heuristic to allow unrolling long loops with small bodies and short loops with large bodies. The loop unroll limits may need further tweaking...
| * | | | glsl: implement loop unrolling for simple 'for' loopsBrian Paul2009-01-091-24/+205
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Loops such as this will be unrolled: for (i = 0; i < 4; ++i) { body; } where 'body' isn't too large. This also helps to fix the issue reported in bug #19190. The problem there is indexing vector types with a variable index. For example: vec4 v; v[2] = 1.0; // equivalent to v.z = 1.0 v[i] = 2.0; // variable index into vector!! Since the for-i loop can be unrolled, we can avoid the problems associated with variable indexing into a vector (at least in this case).
| * | | | mesa: Move var declaration to top of scope.Brian Paul2009-01-091-0/+8
| | | | | | | | | | | | | | | | | | | | (cherry picked from commit 3740a06e28f4cd09e2a3dce2da60320aa9304df1)
| * | | | mesa: Add _mesa_snprintf.José Fonseca2009-01-083-7/+7
| | | | | | | | | | | | | | | | | | | | On Windows snprintf is renamed as _snprintf.
| * | | | mesa: Move var declaration to top of scope.José Fonseca2009-01-081-1/+1
| | | | |
| * | | | Merge commit 'origin/master' into gallium-0.2Brian Paul2009-01-062-8/+22
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/mesa/drivers/dri/common/dri_util.c
| * \ \ \ \ Merge commit 'origin/master' into gallium-0.2Brian Paul2009-01-025-24/+58
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/mesa/main/ffvertex_prog.c src/mesa/main/texenvprogram.c
| * \ \ \ \ \ Merge commit 'origin/master' into gallium-0.2Brian Paul2008-12-307-99/+385
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/mesa/main/config.h
| * \ \ \ \ \ \ Merge commit 'origin/master' into gallium-0.2Brian Paul2008-12-191-2/+9
| |\ \ \ \ \ \ \
| * | | | | | | | glsl: Fix handling of nested parens in macro actual arguments.Michal Krol2008-12-181-2/+15
| | | | | | | | |
| * | | | | | | | Merge commit 'origin/master' into gallium-0.2Brian Paul2008-12-1632-4041/+4567
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge commit 'origin/master' into gallium-0.2Alan Hourihane2008-12-081-2/+3
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: progs/glsl/Makefile
| * \ \ \ \ \ \ \ \ \ Merge commit 'origin/master' into gallium-0.2Alan Hourihane2008-11-284-12/+50
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge commit 'origin/master' into gallium-0.2Alan Hourihane2008-11-2515-2642/+2888
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge commit 'origin/master' into gallium-0.2Brian Paul2008-11-242-20/+28
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: progs/glsl/Makefile
| * | | | | | | | | | | | | mesa: copy centroid/invariance/precision info in parse_init_declarator()Brian Paul2008-11-241-1/+4
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | mesa: check that varying variable qualifiers agreeBrian Paul2008-11-241-3/+28
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | mesa: copy precision/variant/centroid info in slang_fully_specified_type_copy()Brian Paul2008-11-241-0/+3
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | mesa: set flags for varying varsBrian Paul2008-11-241-4/+13
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | mesa: rename program parameter flags to match other Mesa conventionsBrian Paul2008-11-242-8/+8
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | mesa: copy Flags in _mesa_clone_parameter_list()Brian Paul2008-11-241-0/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | mesa: dump/debug varying vars listBrian Paul2008-11-241-0/+5
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | mesa: added PROG_PARAM_ bits for invariant, flat/linear interpolationBrian Paul2008-11-242-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Plus, update the print/debug code.
| * | | | | | | | | | | | | mesa: add Flags field to gl_program_parameterBrian Paul2008-11-244-24/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only one flag defined so far: PROG_PARAM_CENTROID_BIT
| * | | | | | | | | | | | | mesa: issue error, don't crash, when calling a prototyped, but undefined ↵Brian Paul2008-11-241-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | function Bug #18659.
| * | | | | | | | | | | | | mesa: better variable name: s/aux/store/Brian Paul2008-11-245-12/+15
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge commit 'origin/master' into gallium-0.2Alan Hourihane2008-11-207-328/+557
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge commit 'origin/master' into gallium-0.2Keith Whitwell2008-11-159-490/+568
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/mesa/shader/prog_print.c
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge commit 'origin/master' into gallium-0.2Brian Paul2008-11-1121-3182/+3495
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/mesa/shader/prog_execute.c src/mesa/shader/slang/library/slang_vertex_builtin_gc.h
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge commit 'origin/master' into gallium-0.2Brian Paul2008-11-072-4/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge commit 'origin/master' into gallium-0.2Brian Paul2008-11-077-28/+295
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \