summaryrefslogtreecommitdiff
path: root/src/mesa/shader/slang
AgeCommit message (Collapse)Author
2009-12-12Merge branch 'master' into glsl-pp-rework-2Michal Krol
Conflicts: progs/perf/drawoverhead.c progs/perf/teximage.c progs/perf/vbo.c progs/perf/vertexrate.c src/mesa/shader/slang/library/slang_common_builtin_gc.h
2009-12-11Merge branch 'mesa_7_7_branch'Brian Paul
Conflicts: src/gallium/state_trackers/xorg/xorg_xv.c src/mesa/drivers/dri/intel/intel_span.c
2009-12-11Merge branch 'mesa_7_6_branch' into mesa_7_7_branchBrian Paul
2009-12-10glsl: Increase size of array in_slang_lookup_constant from 4 to 16.Vinson Lee
For some cases, _mesa_GetIntegerv reads up to params[15].
2009-12-10glsl: Fix array out-of-bounds access by _slang_lookup_constant.Vinson Lee
2009-12-10scons: Get GLSL code building correctly when cross compiling.José Fonseca
This is quite messy. GLSL code has to be built twice: one for the host OS, another for the target OS.
2009-12-10slang: Predefine ES symbols for FEATURE_es2_glsl.Michal Krol
2009-12-10slang: Explicitly enable ARB_draw_buffers and ARB_texture_rectangle.Michal Krol
They are no longer built into the glsl preprocessor.
2009-12-10Build mesa glsl with make.michal
Still don't know how to add glsl to mesa dependencies.
2009-12-09glsl: Remove unused member x from struct slang_operation.Vinson Lee
2009-11-25slang/library: Don't need the *_gc.h files, they are autogenerated now.Michal Krol
2009-11-25scons: Autogenerate GLSL builtin library *_gc.h from *.gc files.Michal Krol
2009-11-24slang: Fix allocation size.Michal Krol
We don't need 16K+ to store a single pointer.
2009-11-23slang: Fix order of parameters to sl_pp_tokenise().Michal Krol
2009-11-23slang: Check return value from emit_instruction().Michal Krol
2009-11-23slang: Be more robust with memory in concat_shaders().Michal Krol
2009-11-21slang: No need to purify source text for tokeniser.Michal Krol
2009-11-17Merge branch 'outputswritten64'Ian Romanick
Add a GLbitfield64 type and several macros to operate on 64-bit fields. The OutputsWritten field of gl_program is changed to use that type. This results in a fair amount of fallout in drivers that use programs. No changes are strictly necessary at this point as all bits used are below the 32-bit boundary. Fairly soon several bits will be added for clip distances written by a vertex shader. This will cause several bits used for varyings to be pushed above the 32-bit boundary. This will affect any drivers that support GLSL. At this point, only the i965 driver has been modified to support this eventuality. I did this as a "squash" merge. There were several places through the outputswritten64 branch where things were broken. I foresee this causing difficulties later for bisecting. The history is still available in the branch. Conflicts: src/mesa/drivers/dri/i965/brw_wm.h
2009-11-17mesa: fix assorted compiler warningsBrian Paul
2009-11-13slang: Report syntax parser errors.Michal Krol
2009-11-13slang: Regenerate .gc files.Michal Krol
2009-11-13slang: Get rid of the old syntax file and utilities.Michal Krol
2009-11-13slang: Plug in the new syntax parser.Michal Krol
2009-11-10slang: Fix return value check.Michal Krol
2009-11-10slang: Check OOM conditions for alloc_node_storage().Michal Krol
2009-11-10slang: Check return value from new_instruction().Michal Krol
2009-11-10slang: Fix signed/unsigned int handling in _slang_free_temp().Michal Krol
2009-11-10slang: Handle OOM condition in new_instruction().Michal Krol
2009-11-10slang: Update for glsl/pp interface changes.Michal Krol
2009-10-27glsl: fix memory leakBrian Paul
A slightly modified version of a patch from Vinson Lee.
2009-10-27glsl: fix memory leakBrian Paul
A slightly modified version of a patch from Vinson Lee.
2009-10-05Merge branch 'mesa_7_6_branch'Brian Paul
Conflicts: src/gallium/auxiliary/util/u_cpu_detect.c
2009-10-01glsl: fix mem leakBrian Paul
2009-10-01Merge branch 'mesa_7_6_branch'Brian Paul
2009-09-29glsl: regenerated fileBrian Paul
2009-09-29glsl: rewrite sqrt(x) intrinsic to handle x=0Brian Paul
Since sqrt() is basically implemented in terms of RSQ/RCP we'll do a divide by zero if x=0 and wind up with unpredictable results. Now use CMP instruction to test for x<=0 and return zero in that case.
2009-09-29glsl: add support for CMP instructionBrian Paul
2009-09-29mesa: added nopfrag/nopvert options for MESA_GLSLBrian Paul
These options can be used to force vertex/fragment shaders to be no-op shaders (actually, simple pass-through shaders). For debug/test purposes.
2009-09-24glsl: init var to silence warningBrian Paul
2009-09-24glsl: fix missing initializers warningBrian Paul
2009-09-22slang: Differentiate between uints and floats.Michal Krol
2009-09-18slang: Use glsl pp public interface.Michal Krol
2009-09-17Merge commit 'origin/master' into glsl-pp-rework-2Michal Krol
Conflicts: src/gallium/winsys/gdi/SConscript
2009-09-16slang: Propagate error messages from preprocessor.Michal Krol
2009-09-16slang: Invoke the preprocessor from withing the slang compiler.Michal Krol
This allows us to validate the shader version number.
2009-09-15Merge branch 'mesa_7_5_branch' into mesa_7_6_branchBrian Paul
2009-09-14glsl: remove extra #version directives from concatenated shader sourcesBrian Paul
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.
2009-09-08slang: Correctly handle end of tokens marker.Michal Krol
2009-09-08slang: Do not parse whitespace.Michal Krol
The preprocessor tokeniser deals with those.
2009-09-08slang: Correctly parse numbers from the new preprocessor.Michal Krol
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-27 15:38:42 +0000