summaryrefslogtreecommitdiff
path: root/src/mesa/shader/slang
AgeCommit message (Collapse)Author
2010-01-16glsl: Remove unnecessary header from slang_link.c.Vinson Lee
2010-01-16glsl: Remove unnecessary header from slang_log.c.Vinson Lee
2010-01-04Merge branch 'mesa_7_7_branch'Brian Paul
Conflicts: docs/relnotes.html src/gallium/drivers/llvmpipe/lp_tex_sample_c.c src/gallium/drivers/r300/r300_cs.h src/mesa/drivers/dri/i965/brw_wm_surface_state.c src/mesa/main/enums.c
2010-01-04glsl: use varName variable in _slang_gen_assignment()Brian Paul
2009-12-31Merge branch 'mesa_7_7_branch'Brian Paul
Conflicts: configs/darwin src/gallium/auxiliary/util/u_clear.h src/gallium/state_trackers/xorg/xorg_exa_tgsi.c src/mesa/drivers/dri/i965/brw_draw_upload.c
2009-12-29glsl: added uniform initializer checkBrian Paul
GLSL 1.10 disallows initializers for uniforms but GLSL 1.20 and later allows them. This patch uses the #version directive to allow/disallow uniform initializers. This addresses bug 25807, but piglit also needs to be fixed to specify the GLSL version in the shader.
2009-12-27Merge branch 'mesa_7_6_branch' into mesa_7_7_branchBrian Paul
Conflicts: src/gallium/auxiliary/util/u_network.c src/gallium/auxiliary/util/u_network.h src/gallium/drivers/i915/i915_state.c src/gallium/drivers/trace/tr_rbug.c src/gallium/state_trackers/vega/bezier.c src/gallium/state_trackers/vega/vg_context.c src/gallium/state_trackers/xorg/xorg_crtc.c src/gallium/state_trackers/xorg/xorg_driver.c src/gallium/winsys/xlib/xlib_brw_context.c src/mesa/main/mtypes.h
2009-12-23glsl: Initialize member a_obj of struct slang_operation.Vinson Lee
2009-12-22mesa: adjust OPCODE_IF/ELSE BranchTarget fields to point to ELSE/ENDIF instr.Brian Paul
This is a little more logical. Suggested in bug report 25654.
2009-12-22mesa: adjust BRK/CONT BranchTarget to always point to ENDLOOP instructionBrian Paul
To be more consistant.
2009-12-21glsl: assorted clean-ups in slang_compile.cBrian Paul
2009-12-21Merge branch 'mesa_7_7_branch'Brian Paul
Conflicts: src/mesa/main/version.h src/mesa/state_tracker/st_atom_shader.c
2009-12-21Merge branch 'mesa_7_6_branch' into mesa_7_7_branchBrian Paul
Conflicts: configure.ac progs/demos/morph3d.c progs/demos/textures.c progs/glsl/shtest.c progs/glsl/texaaline.c progs/tests/packedpixels.c progs/xdemos/corender.c src/mesa/main/version.h
2009-12-20slang: Update after glsl cl interface changes.Michal Krol
2009-12-20slang: Add gitignore for autogenerated files.Michal Krol
2009-12-20slang: Update after glsl pp changes.Michal Krol
2009-12-18glsl: clear out shader code before compilingBrian Paul
When we start compiling a shader, first free the existing gl_program. This (mostly) fixes the piglit glsl-reload-source test. Without this change, we were actually appending the new GPU code onto the previous program.
2009-12-16mesa: remove //-style commentsBrian Paul
2009-12-12glsl: Initialize member label of struct slang_operation to NULL.Vinson Lee
2009-12-12Remove grammar module -- no dependencies left.Michal Krol
2009-12-12slang: Delete a file that is now autogenerated.Michal Krol
This file has been modified in master and removed in feature branch. This gave a merge conflict I couldn't resolve by removing and git adding it to index.
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