Ian Romanick
|
650e02003f
|
Merge branch 'mesa_7_6_branch' into mesa_7_7_branch
Conflicts:
progs/util/shaderutil.c
src/mesa/drivers/dri/r600/r600_context.c
src/mesa/main/version.h
|
2009-11-30 17:47:07 -08:00 |
|
Ian Romanick
|
da0883114b
|
shaderutil: Fix detection of shaders
Check for versions >= 2.0 (because some drivers return 3.0), and return
GL_FALSE if shaders are not detected.
|
2009-11-23 18:33:50 -08:00 |
|
Brian Paul
|
6acb82dab0
|
progs/util: warn when GLSL not supported
|
2009-11-17 19:22:11 -07:00 |
|
Vinson Lee
|
11905da883
|
progs/util: Fix memory leak if fread returns 0 in CompileShaderFile.
|
2009-11-17 12:00:22 -08:00 |
|
Vinson Lee
|
c475079ef2
|
progs/util: Fix memory leak if fail to load/compile shader
Signed-off-by: Brian Paul <brianp@vmware.com>
|
2009-11-03 14:49:41 -07:00 |
|
Brian Paul
|
fa6299cb31
|
progs/util: added ValidateShaderProgram() to shaderutil.c
|
2009-08-25 17:46:10 -06:00 |
|
Brian Paul
|
f300db379e
|
progs/util: added GetShaderCompile/LinkTime() to get compilation/link times
|
2009-08-20 14:43:32 -06:00 |
|
Brian Paul
|
741869d73a
|
progs/util: ignore pre-defined uniforms in SetUniformValues()
|
2009-08-13 12:53:20 -06:00 |
|
Brian Paul
|
fdfb0d4b0e
|
progs/glsl: change uniform_info::type field to use GLSL vector types
|
2009-08-12 17:28:45 -06:00 |
|
Brian Paul
|
684049d97d
|
demos: rename InitUniforms() to SetUniformValues()
And call new PrintUniforms() in demos.
|
2009-08-12 17:28:45 -06:00 |
|
Brian Paul
|
378bff0edd
|
progs/util: added more shader utility functions
|
2009-08-12 17:28:45 -06:00 |
|
Brian Paul
|
cd10996d4f
|
progs/util: remove extfuncs.h (we use GLEW instead)
|
2009-07-17 14:43:29 -06:00 |
|
Keith Whitwell
|
14a2b5445a
|
progs/util: make sure function pointers are initialized
Call Init() from CompileShaderFile, was previously only called for the
Text version of this function.
|
2009-06-30 15:41:43 +01:00 |
|
Brian Paul
|
637f06dcdc
|
util: check for frag/vertShader=0 before attaching
|
2008-12-17 13:58:05 -07:00 |
|
Brian Paul
|
35a9f1bccf
|
print err msg if unable to open shader file
|
2008-11-04 16:55:18 -07:00 |
|
Corbin Simpson
|
567d87744a
|
added test for ARB GLSL extensions
|
2008-08-16 11:07:51 -06:00 |
|
Brian
|
90caba3d76
|
shader utility functions
|
2008-04-09 22:30:42 -06:00 |
|