summaryrefslogtreecommitdiff
path: root/src/mesa/shader/slang/slang_link.c
AgeCommit message (Collapse)Author
2009-01-09glsl: check that the fragment shader does not write both gl_FragColor and ↵Brian Paul
gl_FragData[]
2009-01-08mesa: Add _mesa_snprintf.José Fonseca
On Windows snprintf is renamed as _snprintf.
2009-01-02Merge commit 'origin/master' into gallium-0.2Brian Paul
Conflicts: src/mesa/main/ffvertex_prog.c src/mesa/main/texenvprogram.c
2009-01-02mesa: fix another "out of samplers" problemBrian Paul
Now only the samplers that are actually used by texture() functions are saved in the uniform variable list. Before, we could run out of samplers if too many were declared while only some of them were actually used.
2008-12-31mesa: increase max texture image units and GLSL samplers to 16Brian Paul
The max texture coord units is still 8. All the fixed-function paths are still limited to 8 too. But GLSL shaders can use more samplers now. Note that some texcoord-related data structures are declared to be 16 elements in size rather than 8. This just simplifies the code in a few places; the extra elements aren't accessible to the user. These changes haven't been extensively tested yet, but sanity checking has been done. It should be possible to increase the max image units/samplers to 32 without doing anything special. Beyond that we'll need longer bitfields in a few places.
2008-12-30Merge commit 'origin/master' into gallium-0.2Brian Paul
Conflicts: src/mesa/main/config.h
2008-12-30mesa: better error message when running out of GLSL samplersBrian Paul
2008-12-16Merge commit 'origin/master' into gallium-0.2Brian Paul
2008-12-15mesa: in slang linker, replace assertion with link error when max samplers ↵Brian Paul
exceeded
2008-11-24Merge commit 'origin/master' into gallium-0.2Brian Paul
Conflicts: progs/glsl/Makefile
2008-11-24mesa: check that varying variable qualifiers agreeBrian Paul
2008-11-24mesa: dump/debug varying vars listBrian Paul
2008-11-24mesa: add Flags field to gl_program_parameterBrian Paul
Only one flag defined so far: PROG_PARAM_CENTROID_BIT
2008-11-24mesa: add gl_program::Input/OutputFlags[] arrayBrian Paul
These arrays will indicate per-input or per-output options for vertex/fragment programs such as centroid-sampling and invariance.
2008-11-24mesa: check that varying variable qualifiers agreeBrian Paul
2008-11-24mesa: dump/debug varying vars listBrian Paul
2008-11-24mesa: add Flags field to gl_program_parameterBrian Paul
Only one flag defined so far: PROG_PARAM_CENTROID_BIT
2008-11-11Merge commit 'origin/master' into gallium-0.2Brian Paul
Conflicts: src/mesa/shader/prog_execute.c src/mesa/shader/slang/library/slang_vertex_builtin_gc.h
2008-11-10mesa: track initialization status of uniform variables. Plus, asst clean-ups.Brian Paul
2008-11-10mesa: fix logic error in GLSL linker when looking for main() shadersBrian Paul
2008-11-06mesa: update the shader programs->TexturesUsed array at link timeBrian Paul
If an application never calls glUniform() to set sampler variable values they'll remain 0 (the default value/unit). Now call _mesa_update_shader_textures_used() at link time in case glUniform() is never called. program->TextureUsed[] will then be correct for state validation.
2008-11-06Merge commit 'origin/gallium-0.1' into gallium-0.2Brian Paul
2008-11-06mesa: update the shader programs->TexturesUsed array at link timeBrian Paul
If an application never calls glUniform() to set sampler variable values they'll remain 0 (the default value/unit). Now call _mesa_update_shader_textures_used() at link time in case glUniform() is never called. program->TextureUsed[] will then be correct for state validation.
2008-11-05mesa: Fix compiler warnings on Windows.Brian Paul
cherry-picked subset of a77976d2ee578d0483c64f2aa41719bbae9c1c97
2008-11-01Merge commit 'origin/master' into gallium-0.2Alan Hourihane
Conflicts: src/mesa/shader/slang/library/slang_vertex_builtin_gc.h
2008-11-01mesa: additional debug flags for glsl debug/disassemblyBrian Paul
2008-11-01mesa: additional debug flags for glsl debug/disassemblyBrian Paul
2008-10-02mesa: Fix compiler warnings on Windows.Michal Krol
2008-10-01mesa: Fix compiler warnings on Windows.Michal Krol
2008-09-23mesa: update program->NumAddressRegs field in _slang_update_inputs_outputs()Brian Paul
2008-09-23mesa: new gl_fragment_program fields indicating use of fog, front-facing, ↵Brian Paul
point coord (cherry picked from commit d7a7b0a10dd355fbeb7a404091a42d4ab558c820)
2008-09-18Merge commit 'origin/gallium-0.1' into gallium-0.2Keith Whitwell
Conflicts: src/mesa/shader/slang/slang_link.c
2008-09-17mesa: new gl_fragment_program fields indicating use of fog, front-facing, ↵Brian Paul
point coord
2008-09-17mesa: update program->NumAddressRegs field in _slang_update_inputs_outputs()Brian Paul
2008-09-17mesa: fix bug in previous changes to _slang_resolve_attributes()Brian Paul
2008-09-17mesa: fix bug in previous changes to _slang_resolve_attributes()Brian Paul
2008-09-16mesa: rework GLSL vertex attribute bindingBrian Paul
Calls to glBindAttribLocation() should not take effect until the next time that glLinkProgram() is called. gl_shader_program::Attributes now just contains user-defined bindings. gl_shader_program::VertexProgram->Attributes contains the actual/final bindings.
2008-09-16mesa: rework GLSL vertex attribute bindingBrian Paul
Calls to glBindAttribLocation() should not take effect until the next time that glLinkProgram() is called. gl_shader_program::Attributes now just contains user-defined bindings. gl_shader_program::VertexProgram->Attributes contains the actual/final bindings.
2008-08-25mesa: glsl: grab latest fixes from gallium-0.1 branchBrian Paul
Includes: 1. Fixes failed asserting about bad swizzles in src reg emit. 2. Tracks uniform var usage. 3. Emit exp() in terms of EXP2 instruction.
2008-08-19mesa: glsl: add usage tracking for uniform varsBrian Paul
Unused uniforms are no longer included in the active uniforms list.
2008-08-16mesa: import latest GLSL code from gallium-0.1 branchBrian Paul
2008-08-15mesa: glsl: fix linking of varying vars which are arraysBrian Paul
2008-08-07mesa: Silence compiler warnings on Windows.Michal Krol
2008-08-06mesa: glsl: additional error checkingBrian Paul
2008-08-06mesa: glsl: count number of temp regs usedHaihao Xiang
2008-08-06disable debug code accidentally enabled by prev commitBrian Paul
2008-08-06mesa: glsl: count number of temp regs usedHaihao Xiang
2008-07-29mesa: glsl: only try to link shaders defining main()Brian Paul
2008-07-29mesa: assorted glsl uniform/attribute fixesBrian Paul
Fix incorrect uniform/attribute size query results. Add missing error checking for glUniform, glUniformMatrix params Fix an array size/allocation error.
2008-07-24mesa: glsl: only try to link shaders defining main()Brian Paul