Commit Graph

50 Commits

Author SHA1 Message Date
Brian
dc6fab90b4 use ctx->Driver.DeleteProgram() in a few more places 2008-03-22 10:27:03 -06:00
Xiang, Haihao
3ffd11f71d mesa: separate shader program object from shader object.
Currently a callback delete_shader_cb is used for deleting shader
and shader program objects. Mesa detaches all attached shaders in
_mesa_free_shader_program_data when deleting shader program objects. However
it is likely that these shaders have been freed in _mesa_free_shader,
which will result in unexpected behaviour. This fix uses a single callback for
shader program objects and deletes shader program objects before shader objects.
2008-02-28 21:32:36 +08:00
Bruce Merry
2bf2a8cc6d Convert to 0/1 when setting boolean uniforms
Also add some extra tests to the shader_api regression tests
2008-01-01 09:58:15 -07:00
Bruce Merry
3f948025db Make use of count in _mesa_uniform_matrix 2008-01-01 09:58:15 -07:00
Bruce Merry
89b80327ae More fixes to shader_api
- return GL_INVALID_OPERATION instead of GL_INVALID_VALUE if location is bad
- correct the type-checking of uniforms from my previous commit
- accept location of -1 in _mesa_uniform_matrix
2008-01-01 09:58:15 -07:00
Bruce Merry
eeb03faadc Fix several bugs relating to uniforms and attributes in GLSL API
- fix sizes for GL_FLOAT_MAT2x3 and GL_FLOAT_MAT4x3 in sizeof_glsl_type
- fix size returns in _mesa_get_active_attrib
- fix out-of-bounds array access to vec_types in _mesa_get_active_attrib
- fix queries of matrix uniforms in _mesa_get_uniformfv
- fix _mesa_get_uniformfv to only return one base, even from an array
- allow location == -1 in _mesa_uniform
- validate types in _mesa_uniform
- allow array overruns in _mesa_uniform
2008-01-01 09:58:15 -07:00
Brian
2761cfce46 return correct size from glGetActiveUniform (bug 13751) 2007-12-20 09:06:05 -07:00
Brian
237b985356 fix potential NULL dereference (bug 11880) 2007-08-07 21:48:31 +01:00
Jan Dvorak
5a0f02a394 fix shader/info string length queries (bug 11588) 2007-07-13 16:36:00 -06:00
Brian
c223c6b663 Be more consistant with paths in #includes. Eventually, eliminate a bunch of -I flags. 2007-07-04 13:15:20 -06:00
Brian
3e4302fe3b Check that texture units/samplers specified with glUniform1i() are legal. 2007-05-09 08:07:15 -06:00
Brian
4b7c6fc5a6 free shProg->Attributes in _mesa_free_shader_program_data() 2007-04-21 10:05:05 -06:00
Brian
c93e883b20 Start fixing some issues with uniform variables and their types. 2007-04-18 17:14:13 -06:00
Brian
274ac7a801 Fix some bugs related to querying active uniforms. 2007-04-18 17:14:13 -06:00
Brian
aaa57412c1 fix error strings, add a sanity check 2007-04-18 17:14:13 -06:00
Brian
bac15c8db8 Remove bad assertions, decrement NumShaders in _mesa_detach_shader().
Fixes crashes w/ Brad King's depth peeling test.
2007-04-18 14:55:18 -06:00
Brian
f3e8c32376 s/GL_SHADER_PROGRAM/GL_SHADER_PROGRAM_MESA/ (a Mesa-specific token) 2007-04-18 14:53:23 -06:00
Brian
6d3d9c1c6d Replace _mesa_parameter_longest_name() with _mesa_longest_parameter_name().
The later takes a type parameter so we can match uniforms or attributes/inputs.
Used by the GL_ACTIVE_ATTRIBUTE_MAX_LENGTH and GL_ACTIVE_UNIFORM_MAX_LENGTH
queries.  Fixes problem reported by Brad King in VTK.
2007-04-18 14:19:17 -06:00
Brian
99193e4f74 disable debug printfs 2007-04-12 15:45:02 -06:00
Brian
3c008a014f New _mesa_reference_shader/program() function to consolidate refcounting.
Note that (unlike texture objects), shader handles remain valid (in the
hash table) after glDeleteShader/Program() if the refcount isn't zero.
2007-04-12 15:22:32 -06:00
Brian
9f66025f54 fix invalid error detection problem in _mesa_bind_attrib_location(), bug 10602 2007-04-11 09:00:56 -06:00
Brian
b9fbedd601 fix mem leak, add comments 2007-03-26 09:23:44 -06:00
Brian
935f93f966 Free shader-related context state: _mesa_free_shader_state() 2007-03-24 16:20:02 -06:00
Brian
63556fa994 Add the ability to generate programs that doesn't use condition codes.
ctx->Shader.EmitCondCodes determines if we use condition codes.
If not, IF statement uses first operand's X component as the condition.
Added OPCODE_BRK0, OPCODE_BRK1, OPCODE_CONT0, OPCODE_CONT1 to handle
the common cases of conditional break/continue.
2007-03-23 14:47:46 -06:00
Brian
52363954bf more bug fixing, error checking 2007-03-13 16:50:24 -06:00
Brian
98650bdf89 fix a number of issues in _mesa_uniform() 2007-03-13 16:32:48 -06:00
Brian
9f44247acf fix _mesa_uniform_matrix() transpose bug 2007-03-09 11:34:18 -07:00
Brian
cec81eef31 check for null program ptrs in _mesa_uniform() 2007-03-07 08:04:06 -07:00
Brian
fa4d036424 Add EmitHighLevelInstructions, EmitComments booleans to gl_shader_state.
These control code generation options.  May be overridden by drivers, debuggers, etc.
2007-02-26 18:33:50 -07:00
Brian
5e80c62f31 Remove unneeded _Fragment/VertexShaderPresent fields, update comments. 2007-02-24 15:39:37 -07:00
Brian
c177191804 s/_slang_link2/_slang_link/ 2007-02-16 09:56:19 -07:00
Brian
00d63aafc6 added FLUSH_VERTICES() in _mesa_use_program() 2007-02-03 11:35:02 -07:00
Brian
fee9bbe475 Only glUniform1i() can be used to set sampler uniforms. Generate error otherwise. 2007-02-02 18:05:43 -07:00
Brian
7162398778 fix _mesa_get_uniform_location() so it uses the given program handle 2007-01-30 16:55:03 -07:00
Brian
223d7cb3c7 fix g++ warnings/errors 2007-01-23 16:37:51 -07:00
Brian
88e2dbfd10 checkpoint: codegen for global vars w/ initializers 2007-01-10 13:33:38 -07:00
Brian
8a48f35574 assorted code clean-ups 2007-01-10 12:18:50 -07:00
Brian
01a91eb657 get rid of STATE_USER_ATTRIB/STATE_AUTO_ATTRIB 2007-01-09 19:26:22 -07:00
Brian
b7978af693 clean up a bunch of program parameter stuff 2007-01-09 19:17:17 -07:00
Brian
3209c3ed0d Implement vertex attribute binding.
Users can set explicit binding with glBindAttribLocation(), otherwise the
linker will allocate generic attribute slots.
2007-01-09 17:49:24 -07:00
Brian
5cf7326132 Checkpoint glsl compiler work: sampler uniforms now implemented, linked properly. 2007-01-05 16:02:45 -07:00
Brian
89dc48569a finish some loose ends in _mesa_uniform() 2007-01-04 14:35:44 -07:00
Brian
439758353a Fix some incorrect GL error values. Reorganize _mesa_compile_shader() code. 2007-01-04 08:21:09 -07:00
Brian
2905385744 comment about uniforms 2006-12-21 11:21:26 -07:00
Brian
3a8e2776a6 Uniform matrix support.
Implement _mesa_uniform_matrix()
Support for program parameters/uniforms with more than 4 elements.
Store 4x4 matrices in column-major order in registers.
Update mat mul built-in functions accordingly.
2006-12-20 17:19:16 -07:00
Brian
f2923613a4 code re-org 2006-12-20 09:56:44 -07:00
Brian
9e4bae9cca Fix shader object reference counting and hash table deallocation. 2006-12-20 09:27:42 -07:00
Brian
65a18442e5 Clean-up and re-org of the main GLSL object types.
Use the gl_shader struct as it should be.
Renamed gl_linked_program to gl_shader_program.
Store both shaders and programs in the same hash table and use the Type field
to distinguish them.
2006-12-19 18:46:56 -07:00
Brian
5b01c5e9d2 Overhaul of GLSL API functions, dispatching, etc. 2006-12-19 18:02:03 -07:00
Brian
34ae99d604 GLSL API functions. 2006-12-18 08:28:54 -07:00