summaryrefslogtreecommitdiffstats
path: root/src/mesa/shader
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * glsl: silence unused var warningsBrian Paul2009-01-201-0/+2
| |
| * mesa: silence compiler warning at -O2Brian Paul2009-01-201-0/+1
| |
* | Merge commit 'origin/master' into gallium-0.2Alan Hourihane2009-01-165-10/+24
|\| | | | | | | | | Conflicts: src/mesa/shader/slang/slang_compile.c
| * glsl: fix broken sampler assignmentsBrian Paul2009-01-161-1/+2
| |
| * glsl: use _mesa_sprintf()Brian Paul2009-01-151-2/+2
| |
| * glsl: move declaration before codeBrian Paul2009-01-151-1/+1
| |
| * glsl: fix commentBrian Paul2009-01-141-1/+1
| |
| * glsl: minor clean-up for rect sampler testBrian Paul2009-01-141-5/+18
| |
* | 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: propagate pragma info down into compiler from preprocessorBrian Paul2009-01-147-21/+80
| |
| * glsl: simplify IR storage for samplersBrian Paul2009-01-144-13/+34
| | | | | | | | Don't overload the Size field with the texture target, to avoid confusion.
| * Treat image units and coordinate units differently.Ian Romanick2009-01-141-3/+28
| | | | | | | | | | | | | | | | | | | | | | | | Previously MaxTextureUnits was used to validate both texture image units and texture coordinate units in fragment programs. Instead, use MaxTextureCoordUnits for texture coordinate units and MaxTextureImageUnits for texture image units. Fixes bugzilla #19468. Signed-off-by: Ian Romanick <[email protected]> Reviewed-by: Brian Paul <[email protected]>
| * glsl: fix regression from sampler arrays commitAlan Hourihane2009-01-141-3/+1
| |
| * mesa: put _NV suffix on a few opcodesBrian Paul2009-01-141-5/+6
| |
| * glsl: fix a comment typoAlan Hourihane2009-01-141-1/+1
| |
| * glsl: support sampler arrays.Alan Hourihane2009-01-143-11/+49
| |
| * glsl: add preprocessor support for #pragmaBrian Paul2009-01-133-1/+74
| | | | | | | | | | | | Two forms are supported: Pragmas are silently ignored at this time.
| * glsl: better fix for for-loop scope issue (commit ↵Brian Paul2009-01-123-31/+4
| | | | | | | | 6333005f7aea3e5d1d86a5c47b3fa2a1ed2f3ff0)
| * glsl: force creation of new scope for for-loop bodyBrian Paul2009-01-101-0/+18
| | | | | | | | | | | | | | | | | | | | | | Fixes regression in progs/demos/convolution.c due to loop unrolling. This also allows the following to be compiled correctly: for (int i = 0; i < n; i++) { int i; ... } This fix is a bit of a hack, however. The better fix would be to change the slang_shader.syn grammar. Will revisit that...
| * glsl: replace 0/1 with GL_FALSE/GL_TRUEBrian Paul2009-01-101-18/+18
| |
| * glsl: make minimum struct size = 2, not 1Brian Paul2009-01-091-1/+8
| | | | | | | | | | | | | | 1-component structs such as "struct foo { float x; }" could get placed at any position within a register. This caused some trouble computing the field offset which assumed all struct objects were placed at R.x. It would be unusual to hit this case in normal shaders.
| * glsl: fix typo in the vec2 += operator functionBrian Paul2009-01-082-2/+2
| |
| * glsl: fix broken +=, -=, *=, /= operatorsBrian Paul2009-01-082-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-081-1/+1
| |
| * mesa: additional case in file_string()Brian Paul2009-01-071-0/+2
| |
| * glsl: pass GLcontext::Extension info down into GLSL preprocessorBrian Paul2009-01-073-35/+65
| | | | | | | | Now the #extension directives can be handled properly.
| * glsl: bump up MAX_FOR_LOOP_UNROLL_COMPLEXITYBrian Paul2009-01-071-1/+1
| |
| * glsl: check that the fragment shader does not write both gl_FragColor and ↵Brian Paul2009-01-071-0/+11
| | | | | | | | gl_FragData[]
| * mesa: Add _mesa_snprintf.José Fonseca2009-01-073-7/+7
| | | | | | | | | | | | On Windows snprintf is renamed as _snprintf. (cherry picked from commit f8f9a1b620d31d1a59855fd502caed325d4a324f)
| * glsl: disable some unused functions (but don't remove just yet)Brian Paul2009-01-071-1/+8
| |
| * glsl: also unroll loops with variable declarations such as "for (int i = 0; ..."Brian Paul2009-01-071-24/+58
| |
| * glsl: remove dead codeBrian Paul2009-01-071-13/+2
| |
| * glsl: loop unroll adjustmentsBrian Paul2009-01-061-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-061-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-061-0/+8
| | | | | | | | (cherry picked from commit 3740a06e28f4cd09e2a3dce2da60320aa9304df1)
* | 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
| |