summaryrefslogtreecommitdiff
path: root/src/mesa/shader
AgeCommit message (Collapse)Author
2009-09-21r300: Fix handling of NV_vertex_program parametersNicolai Hähnle
The handling is a bit inefficient, unfortunately, but I don't want to make any intrusive changes for Mesa 7.6. Signed-off-by: Nicolai Hähnle <nhaehnle@gmail.com>
2009-09-15Merge branch 'mesa_7_5_branch' into mesa_7_6_branchBrian Paul
2009-09-14glsl: added some link debug code (disabled)Brian 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-04ARB prog: replace 'unsigned' with 'gl_state_index'Brian Paul
Fixes compilation warnings with MSVC.
2009-09-04ARB prog: rename POINT, SIZE to POINT_TOK, SIZE_TOKBrian Paul
Fixes symbol collisions with typedefs in Microsoft headers. Perhaps we should prefix/suffix all the lexer tokens to avoid this.
2009-09-01ARB prog parser: Fix handling of stateOptModMatNumIan Romanick
The optional array index should clearly be enclosed in square brackets. This helps the oglconform test vp_binding.c get a bit farther, but it still fails.
2009-08-31mesa: debug printf for KILBrian Paul
2009-08-27Merge branch 'mesa_7_5_branch'Brian Paul
2009-08-27mesa: direct program debug output to stderr instead of stdoutmarvin24
2009-08-27mesa: move decls before codeVinson Lee
2009-08-26Merge branch 'mesa_7_5_branch'Brian Paul
2009-08-26glsl: asst. clean-ups in set_program_uniform()Brian Paul
Remove redunant type check for samplers (assert instead). Move some local vars. Update comments.
2009-08-26glsl: signal that the program needs to be re-translated when samplers changeBrian Paul
2009-08-26mesa: var renaming, new assertionBrian Paul
2009-08-26mesa: additional instruction field size assertionsBrian Paul
2009-08-26Merge branch 'mesa_7_5_branch'Brian Paul
2009-08-26glsl: fix bug in sampler array indexingBrian Paul
Need to add the 'offset' parameter when indexing the parameter array. Before, if we were setting arrays of samplers, we were actually only setting the 0th sampler's value. Because of how progs/glsl/samplers.c is constructed, this wasn't showing up as a failure in the samplers_array output.
2009-08-25glsl: update a texture/sampler commentBrian Paul
2009-08-25glsl: implement shader sampler validationBrian Paul
Shader validation should fail if there are two samplers of different types which reference the same texture unit. For example, if a cubemap sampler and a 2D sampler both reference texture unit 0, that's invalid.
2009-08-25mesa: print some program fields in binary tooBrian Paul
2009-08-24ARB prog: Set error instead of falling through with incorrect valueBrian Paul
If a fragment program only parameter was queried of a vertex program (e.g., GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB) no error would be set and a random value would be returned. This caused 'glxinfo -l' to show the same values for GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB, GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB, GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB, GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB, GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB, GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB as for GL_MAX_PROGRAM_ENV_PARAMETERS_ARB. This is confusing and incorrect. (cherry picked from master, commit 4bccd693a72a0b42dffc849034263a68e779ca91)
2009-08-24ARB prog: Set error instead of falling through with incorrect valueIan Romanick
If a fragment program only parameter was queried of a vertex program (e.g., GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB) no error would be set and a random value would be returned. This caused 'glxinfo -l' to show the same values for GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB, GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB, GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB, GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB, GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB, GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB as for GL_MAX_PROGRAM_ENV_PARAMETERS_ARB. This is confusing and incorrect.
2009-08-24glsl: Silence gcc uninitialized variable warning.Vinson Lee
2009-08-24ARB prog parser: Regenerate parser from previous commitIan Romanick
2009-08-24ARB prog parser: use correct context limitsBrian Paul
2009-08-24glsl: Silence gcc uninitialized variable warning.Vinson Lee
2009-08-24mesa: _mesa_layout_parameters() returns a boolean valueBrian Paul
2009-08-23ARB prog lexer: Fix lexer to eat both DOS and Unix line endingsIan Romanick
2009-08-22ARB prog parser: include imports.h to kill some compiler warningsLuo Jinghua
2009-08-20ARB prog parser: Revert part of previous change to constant parsingIan Romanick
The commit "ARP prog parser: Implement the spec, not what makes sense" broke the parsing of scalar constants. This commit reverts that part of that commit. Now vp_swizzle.c passes.
2009-08-18Merge branch 'master' into asm-shader-rework-1Ian Romanick
Conflicts: src/mesa/shader/arbprogparse.c
2009-08-18ARB prog parser: Delete the old parserIan Romanick
2009-08-18ARB prog: Revert some changes to debug outputIan Romanick
2009-08-14mesa: also pass the GPU program to _mesa_append_uniforms_to_file()Brian Paul
We want the post-link program at this points.
2009-08-14Merge branch 'mesa_7_5_branch'Brian Paul
2009-08-14mesa: new _mesa_append_uniforms_to_file() debug/logging functionBrian Paul
2009-08-13glsl: fix some uninitialized pointersBrian Paul
2009-08-13glsl: fix incorrect attribute sizeBrian Paul
2009-08-12glsl: remove duplicate frag input entryBrian Paul
2009-08-12Merge branch 'new-frag-attribs'Brian Paul
This branch introduces new FRAG_ATTRIB_FACE and FRAG_ATTRIB_PNTC fragment program inputs for GLSL gl_FrontFacing and gl_PointCoord. Before, these attributes were packed with the FOG attribute. That made things complicated elsewhere.
2009-08-12glsl: add gl_Vertex, gl_Normal, etc to list of active attributesBrian Paul
If a vertex shader uses gl_Vertex, gl_Normal, etc, we need to include them when the user queries the list of active attributes. Before this we were just including the user-defined attributes.
2009-08-12glsl: move predefined shader input/output info/code to slang_builtin.cBrian Paul
This is a more logical place for this code. Also add some functions for querying vertex shader input names, types, etc.
2009-08-04mesa: log the shader checksumBrian Paul
2009-08-04mesa: compute, print shader checksumBrian Paul
2009-07-30ARB prog parser: Add support for RGBA components to SWZ instruction in fpIan Romanick
2009-07-30ARB prog parser: Prevent NULL ptr deref for KIL instructionIan Romanick
The KIL instruction doesn't have a destination register, so dereferencing dst in asm_instruction_ctor would cause a segfault.
2009-07-30Merge branch 'mesa_7_5_branch'Brian Paul
2009-07-30mesa: move misplaced return statementBrian Paul
Fixes regression from commit 7d93f817c9c5222e2bdbaa9fa9f03fc502bfe878
2009-07-30Merge branch 'mesa_7_5_branch'Brian Paul