summaryrefslogtreecommitdiff
path: root/src/mesa/shader
AgeCommit message (Collapse)Author
2010-01-08Merge branch 'mesa_7_7_branch'Brian Paul
Conflicts: src/mesa/drivers/dri/i965/brw_wm_emit.c
2010-01-06mesa: test index bounds before array elementRoel Kluin
Check whether the index is within bounds before accessing the array. Signed-off-by: Roel Kluin <roel.kluin@gmail.com> Signed-off-by: Brian Paul <brianp@vmware.com>
2010-01-06Merge remote branch 'origin/mesa_7_7_branch'José Fonseca
Conflicts: configs/default src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c src/mesa/main/version.h
2010-01-05ARB prog parser: regenerated parser fileBrian Paul
2010-01-05ARB prog parser: fix parameter binding typeBrian Paul
References to program local and enviroment parameters are put into the unified program parameters list as PROGRAM_STATE_VAR entries which point into the local or environment arrays. So the param_binding_type field should be PROGRAM_STATE_VAR. This fixes the piglit vpfp-generic vp-arl-env-array.vpfp and vp-arl-local-array.vpfp test failures.
2010-01-05ARB prog parser: regenerated parser filesBrian Paul
2010-01-05ARB prog parser: add allowSwizzle param to initialize_symbol_from_const()Brian Paul
We need to disable constant consolidation when building an array of constants which might be indexed indirectly. Fixes regression in piglit vpfp-generic vp-arl-constant-array.vpfp test caused by earlier constant consolidation patch.
2010-01-05mesa: whitespace changes and commentsBrian Paul
2010-01-05mesa: change constant search behaviour in _mesa_add_unnamed_constant()Brian Paul
Only search for an existing, matching constant if swizzleOut is non-null. We need to be able to disable constant consolidation when building an array of constants which will be indexed indirectly.
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
2010-01-01ARB prog parser: Silence unused variable warnings.Vinson Lee
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-29ARB prog parser: use _mesa_add_unnamed_constant() to use fewer constant slotsBrian Paul
This function will search the constant parameters in an effort to re-use constant slots. For example, {1,2,3,4} and {4,1,1,2} can be stored in one constant slot and accessed with different swizzles. The swizzle info must be propogated though the parsing code in a few places. Fixes Piglit "vpfp-generic tests/shaders/generic/big-param.vpfp" failure.
2009-12-28mesa: remove gratuitous stores I added in remove_instructions.Eric Anholt
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-27Merge branch 'mesa_7_7_branch'Brian Paul
2009-12-23glsl: Initialize member a_obj of struct slang_operation.Vinson Lee
2009-12-22mesa: Fix a NULL deref in glDeleteFragmentShaderATI(badname);Eric Anholt
Fixes piglit ati-fs-bad-delete. Caught by clang.
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-22mesa: added some assertions in BNGLOOP/ENDLOOP casesBrian Paul
2009-12-22mesa: fix binary() function, printf format stringBrian Paul
Need to use the constant 1ULL and 0xllx format string. This fixes incorrect results and a NULL pointer/parameter bug.
2009-12-21glsl: assorted clean-ups in slang_compile.cBrian Paul
2009-12-21mesa: Include <unistd.h> only when one is available.Michal Krol
(cherry picked from commit 970823978c2f7d2cf0757aa6ddbd6289b34c476f)
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-11mesa: remove unnecessary loop in _mesa_remove_output_reads()Brian Paul
2009-12-11Merge branch 'mesa_7_6_branch' into mesa_7_7_branchBrian Paul
2009-12-11mesa: check dst reg in _mesa_find_free_register()Brian Paul
If a register was only being used as a destination (as will happen when generated condition-codes) we missed its use. So we'd errantly return a register index that was really in-use, not free. Fixes bug 25579.
2009-12-10mesa: Initialize variable in MatchInstruction.Vinson Lee
2009-12-10mesa: Assign _mesa_lookup_parameter_index return value to GLint.Vinson Lee
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.